Update MailNews Core.
authorSerge Gautherie <sgautherie.bz@free.fr>
Tue, 10 Nov 2009 04:14:25 +0100
changeset 4347 742a93026723b6b4a31f4b7033a048fcc4b15176
parent 4346 f3a99b4c827571c205727e0faa7c889a3e279911
child 4348 401efe3c7c6afcf80356cf2f7ce2badbf63bc079
push id3398
push usersgautherie.bz@free.fr
push dateTue, 10 Nov 2009 03:24:14 +0000
treeherdercomm-central@401efe3c7c6a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs521293, 515777
Update MailNews Core. Bug 521293 - Port |Bug 515777 - move css files, hiddenWindow.html to jar| to comm-central (apps); (Av1a). r+sr=standard8.
mailnews/mime/src/mimemoz2.cpp
--- a/mailnews/mime/src/mimemoz2.cpp
+++ b/mailnews/mime/src/mimemoz2.cpp
@@ -1190,21 +1190,17 @@ mime_image_make_image_html(void *image_c
   const char *url;
   char *buf;
 
   PR_ASSERT(mid);
   if (!mid) return 0;
 
   /* Internal-external-reconnect only works when going to the screen. */
   if (!mid->istream)
-#ifdef MOZILLA_1_9_1_BRANCH
-    return strdup("<P><CENTER><IMG SRC=\"resource://gre/res/loading-image.gif\" ALT=\"[Image]\"></CENTER><P>");
-#else
-    return strdup("<P><CENTER><IMG SRC=\"resource://gre/res/loading-image.png\" ALT=\"[Image]\"></CENTER><P>");
-#endif
+    return strdup("<P><CENTER><IMG SRC=\"resource://gre-resources/loading-image.png\" ALT=\"[Image]\"></CENTER><P>");
 
   nsCOMPtr<nsIPrefBranch> prefBranch;
   nsCOMPtr<nsIPrefService> prefSvc(do_GetService(NS_PREFSERVICE_CONTRACTID));
   PRBool resize = PR_TRUE;
 
   if (prefSvc)
     prefSvc->GetBranch("", getter_AddRefs(prefBranch));
   if (prefBranch)