Bug 451143 - make AB's print.css contentaccessible, so printing from an addbook:// URI can access it, r=standard8, sr=neil
authorPhil Ringnalda <philringnalda@gmail.com>
Wed, 24 Sep 2008 09:04:21 -0700
changeset 422 3a7803661daa648f43f5f5777631bcd7649cefd3
parent 421 536df74e4ed3a430d1982c0a54da4751965cd522
child 423 04199d7f688434ce7f5b5305415725cfb0c62c1d
push idunknown
push userunknown
push dateunknown
reviewersstandard8, neil
bugs451143
Bug 451143 - make AB's print.css contentaccessible, so printing from an addbook:// URI can access it, r=standard8, sr=neil
mail/components/addrbook/jar.mn
mailnews/addrbook/src/nsAbCardProperty.cpp
mailnews/addrbook/src/nsAddbookProtocolHandler.cpp
mailnews/jar.mn
--- a/mail/components/addrbook/jar.mn
+++ b/mail/components/addrbook/jar.mn
@@ -19,9 +19,9 @@ messenger.jar:
     content/messenger/addressbook/abEditCardDialog.xul          (/mailnews/addrbook/resources/content/abEditCardDialog.xul)
     content/messenger/addressbook/abCardOverlay.xul             (/mailnews/addrbook/resources/content/abCardOverlay.xul)
     content/messenger/addressbook/abCardViewOverlay.xul         (/mailnews/addrbook/resources/content/abCardViewOverlay.xul)
     content/messenger/addressbook/abDirTreeOverlay.xul          (/mailnews/addrbook/resources/content/abDirTreeOverlay.xul)
     content/messenger/addressbook/abResultsPaneOverlay.xul      (/mailnews/addrbook/resources/content/abResultsPaneOverlay.xul)
     content/messenger/addressbook/abResultsPane.js              (/mailnews/addrbook/resources/content/abResultsPane.js)
     content/messenger/addressbook/abDragDrop.js                 (/mailnews/addrbook/resources/content/abDragDrop.js)
     content/messenger/addressbook/abMailListDialog.js           (/mailnews/addrbook/resources/content/abMailListDialog.js)
-    content/messenger/addressbook/print.css                     (/mailnews/addrbook/resources/content/print.css)
+    content/messagebody/addressbook/print.css                   (/mailnews/addrbook/resources/content/print.css)
--- a/mailnews/addrbook/src/nsAbCardProperty.cpp
+++ b/mailnews/addrbook/src/nsAbCardProperty.cpp
@@ -685,17 +685,17 @@ nsresult nsAbCardProperty::ConvertToEsca
 }
 
 nsresult nsAbCardProperty::ConvertToBase64EncodedXML(nsACString &result)
 {
   nsresult rv;
   nsString xmlStr;
 
   xmlStr.AppendLiteral("<?xml version=\"1.0\"?>\n"
-                       "<?xml-stylesheet type=\"text/css\" href=\"chrome://messenger/content/addressbook/print.css\"?>\n"
+                       "<?xml-stylesheet type=\"text/css\" href=\"chrome://messagebody/content/addressbook/print.css\"?>\n"
                        "<directory>\n");
 
   // Get Address Book string and set it as title of XML document
   nsCOMPtr<nsIStringBundle> bundle;
   nsCOMPtr<nsIStringBundleService> stringBundleService = do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv);
   if (NS_SUCCEEDED(rv)) {
     rv = stringBundleService->CreateBundle(sAddrbookProperties, getter_AddRefs(bundle));
     if (NS_SUCCEEDED(rv)) {
--- a/mailnews/addrbook/src/nsAddbookProtocolHandler.cpp
+++ b/mailnews/addrbook/src/nsAddbookProtocolHandler.cpp
@@ -255,17 +255,17 @@ nsAddbookProtocolHandler::BuildDirectory
 {
   NS_ENSURE_ARG_POINTER(aDirectory);
 
   nsresult rv;    
   nsCOMPtr<nsISimpleEnumerator> cardsEnumerator;
   nsCOMPtr<nsIAbCard> card;
 
   aOutput.AppendLiteral("<?xml version=\"1.0\"?>\n"
-                        "<?xml-stylesheet type=\"text/css\" href=\"chrome://messenger/content/addressbook/print.css\"?>\n"
+                        "<?xml-stylesheet type=\"text/css\" href=\"chrome://messagebody/content/addressbook/print.css\"?>\n"
                         "<directory>\n");
 
   // Get Address Book string and set it as title of XML document
   nsCOMPtr<nsIStringBundle> bundle;
   nsCOMPtr<nsIStringBundleService> stringBundleService = do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv); 
   if (NS_SUCCEEDED(rv)) {
     rv = stringBundleService->CreateBundle("chrome://messenger/locale/addressbook/addressBook.properties", getter_AddRefs(bundle));
     if (NS_SUCCEEDED(rv)) {
--- a/mailnews/jar.mn
+++ b/mailnews/jar.mn
@@ -43,17 +43,17 @@ messenger.jar:
     content/messenger/addressbook/addressbook.xul                              (addrbook/resources/content/addressbook.xul)
     content/messenger/addressbook/abDragDrop.js                                (addrbook/resources/content/abDragDrop.js)
     content/messenger/addressbook/abMailListDialog.xul                         (addrbook/resources/content/abMailListDialog.xul)
     content/messenger/addressbook/abMailListDialog.js                          (addrbook/resources/content/abMailListDialog.js)
     content/messenger/addressbook/abListOverlay.xul                            (addrbook/resources/content/abListOverlay.xul)
     content/messenger/addressbook/abEditListDialog.xul                         (addrbook/resources/content/abEditListDialog.xul)
     content/messenger/addressbook/addressbook-panel.xul                        (addrbook/resources/content/addressbook-panel.xul)
     content/messenger/addressbook/addressbook-panel.js                         (addrbook/resources/content/addressbook-panel.js)
-    content/messenger/addressbook/print.css                                    (addrbook/resources/content/print.css)
+    content/messagebody/addressbook/print.css                                  (addrbook/resources/content/print.css)
 *   content/messenger/AccountManager.xul                                       (base/prefs/resources/content/AccountManager.xul)
     content/messenger/AccountManager.js                                        (base/prefs/resources/content/AccountManager.js)
     content/messenger/am-main.xul                                              (base/prefs/resources/content/am-main.xul)
     content/messenger/am-main.js                                               (base/prefs/resources/content/am-main.js)
     content/messenger/am-help.js                                               (base/prefs/resources/content/am-help.js)
     content/messenger/am-server.xul                                            (base/prefs/resources/content/am-server.xul)
     content/messenger/am-serverwithnoidentities.xul                            (base/prefs/resources/content/am-serverwithnoidentities.xul)
     content/messenger/am-serverwithnoidentities.js                             (base/prefs/resources/content/am-serverwithnoidentities.js)