Bug 598942 No new mail icon in fatlibxul builds r=bienvenu sr=Standard8
authorNeil Rashbrook <neil@parkwaycc.co.uk>
Wed, 03 Nov 2010 00:02:18 +0000
changeset 6636 b71a8499c3ec15a8c07f5ca5e459d4ee1ca37d7a
parent 6635 e9aa02dcfc2dba20de52e29edfd87c7506f4fa8e
child 6637 b16d95caed01685f3ff498ca25131f81b77d5660
push idunknown
push userunknown
push dateunknown
reviewersbienvenu, Standard8
bugs598942
Bug 598942 No new mail icon in fatlibxul builds r=bienvenu sr=Standard8
mail/app/splash.rc
mailnews/base/build/Makefile.in
mailnews/base/build/mail.rc
mailnews/base/build/newmail.ico
mailnews/base/build/resource.h
mailnews/base/src/nsMessengerWinIntegration.cpp
mailnews/build/Makefile.in
mailnews/build/mail.rc
mailnews/build/resource.h
suite/app/splash.rc
--- a/mail/app/splash.rc
+++ b/mail/app/splash.rc
@@ -35,19 +35,16 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 #include <windows.h>
 #include "nsNativeAppSupportWin.h"
 
 1 24 "thunderbird.exe.manifest" 
 
-// Program icon.
-IDI_APPLICATION ICON THUNDERBIRD_ICO
-
 STRINGTABLE DISCARDABLE
 BEGIN
 #ifdef DEBUG
     IDS_STARTMENU_APPNAME,              "@MOZ_APP_DISPLAYNAME@ Debug"
 #else
     IDS_STARTMENU_APPNAME,              "@MOZ_APP_DISPLAYNAME@"
 #endif
 END
@@ -79,17 +76,18 @@ IDC_COPY                CURSOR  DISCARDA
 IDC_ALIAS               CURSOR  DISCARDABLE     "../../mozilla/widget/src/build/res/aliasb.cur"
 IDC_ZOOMIN              CURSOR  DISCARDABLE     "../../mozilla/widget/src/build/res/zoom_in.cur"
 IDC_ZOOMOUT             CURSOR  DISCARDABLE     "../../mozilla/widget/src/build/res/zoom_out.cur"
 IDC_COLRESIZE           CURSOR  DISCARDABLE     "../../mozilla/widget/src/build/res/col_resize.cur"
 IDC_ROWRESIZE           CURSOR  DISCARDABLE     "../../mozilla/widget/src/build/res/row_resize.cur"
 IDC_VERTICALTEXT        CURSOR  DISCARDABLE     "../../mozilla/widget/src/build/res/vertical_text.cur"
 IDC_NONE                CURSOR  DISCARDABLE     "../../mozilla/widget/src/build/res/none.cur"
 
+#endif
+
 // For some reason IDI_MAILBIFF needs to be larger than the value of IDI_APPLICATION for static builds
 #define IDI_MAILBIFF 101
 IDI_MAILBIFF  ICON  "../../mailnews/build/newmail.ico"
 
+// Program icon.
 #define IDI_APPICON 100
 IDI_APPICON  ICON  THUNDERBIRD_ICO
 
-#endif
-
--- a/mailnews/base/build/Makefile.in
+++ b/mailnews/base/build/Makefile.in
@@ -39,19 +39,16 @@ DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= msgbase
 LIBRARY_NAME	= msgbase
-ifeq ($(OS_ARCH),WINNT)
-RESFILE		= mail.res
-endif
 META_COMPONENT = mail
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsMsgBaseModule
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
deleted file mode 100644
--- a/mailnews/base/build/mail.rc
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "resource.h"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDI_MAILBIFF  ICON  "newmail.ico"
-/////////////////////////////////////////////////////////////////////////////
deleted file mode 100644
index 301c0853eed2cf5c1e5a9011aca3d83c08037b06..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
--- a/mailnews/base/build/resource.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#define IDI_MAILBIFF 101
-
--- a/mailnews/base/src/nsMessengerWinIntegration.cpp
+++ b/mailnews/base/src/nsMessengerWinIntegration.cpp
@@ -309,33 +309,23 @@ NOTIFYICONDATAW sBiffIconData = { sizeof
                                   NIF_ICON | NIF_MESSAGE | NIF_TIP,
                                   WM_USER,
                                   0,
                                   0 };
 // allow for the null terminator
 static const PRUint32 kMaxTooltipSize = sizeof(sBiffIconData.szTip) /
                                         sizeof(sBiffIconData.szTip[0]) - 1;
 
-#ifdef MOZ_STATIC_BUILD
-#define MAIL_DLL_NAME NULL
-#else
-#ifdef MOZ_STATIC_MAIL_BUILD
-#define MAIL_DLL_NAME "mail.dll"
-#else
-#define MAIL_DLL_NAME "msgbase.dll"
-#endif
-#endif
-
 void nsMessengerWinIntegration::InitializeBiffStatusIcon()
 {
   // initialize our biff status bar icon
   Create();
 
   sBiffIconData.hWnd = (HWND) msgWindow;
-  sBiffIconData.hIcon = ::LoadIcon( ::GetModuleHandle( MAIL_DLL_NAME ), MAKEINTRESOURCE(IDI_MAILBIFF) );
+  sBiffIconData.hIcon = ::LoadIcon( ::GetModuleHandle( NULL ), MAKEINTRESOURCE(IDI_MAILBIFF) );
 
   mBiffIconInitialized = PR_TRUE;
 }
 
 nsresult
 nsMessengerWinIntegration::Init()
 {
   nsresult rv;
--- a/mailnews/build/Makefile.in
+++ b/mailnews/build/Makefile.in
@@ -40,22 +40,16 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= mail
 LIBRARY_NAME = mail
 
-ifndef BUILD_STATIC_LIBS
-ifeq ($(OS_ARCH),WINNT)
-RESFILE		= mail.res
-endif
-endif
-
 META_COMPONENT = mail
 
 EXPORT_LIBRARY = 1
 
 IS_COMPONENT	= 1
 MOZILLA_INTERNAL_API = 1
 GRE_MODULE	= 1
 LIBXUL_LIBRARY	= 1
deleted file mode 100644
--- a/mailnews/build/mail.rc
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "resource.h"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDI_MAILBIFF  ICON  "newmail.ico"
-/////////////////////////////////////////////////////////////////////////////
deleted file mode 100644
--- a/mailnews/build/resource.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#define IDI_MAILBIFF 101
-
--- a/suite/app/splash.rc
+++ b/suite/app/splash.rc
@@ -35,19 +35,16 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 #include <windows.h>
 #include "nsNativeAppSupportWin.h"
 
 1 24 "seamonkey.exe.manifest"
 
-// Program icon.
-IDI_APPLICATION ICON SEAMONKEY_ICO
-
 STRINGTABLE DISCARDABLE
 BEGIN
 	IDS_STARTMENU_APPNAME,              "@MOZ_APP_DISPLAYNAME@"
 END
 
 #ifdef MOZ_STATIC_BUILD
 
 // XXX This code is copied from resource.h and widget.rc.  It's a work-around
@@ -75,16 +72,17 @@ IDC_COPY                CURSOR  DISCARDA
 IDC_ALIAS               CURSOR  DISCARDABLE     "../../mozilla/widget/src/build/res/aliasb.cur"
 IDC_ZOOMIN              CURSOR  DISCARDABLE     "../../mozilla/widget/src/build/res/zoom_in.cur"
 IDC_ZOOMOUT             CURSOR  DISCARDABLE     "../../mozilla/widget/src/build/res/zoom_out.cur"
 IDC_COLRESIZE           CURSOR  DISCARDABLE     "../../mozilla/widget/src/build/res/col_resize.cur"
 IDC_ROWRESIZE           CURSOR  DISCARDABLE     "../../mozilla/widget/src/build/res/row_resize.cur"
 IDC_VERTICALTEXT        CURSOR  DISCARDABLE     "../../mozilla/widget/src/build/res/vertical_text.cur"
 IDC_NONE                CURSOR  DISCARDABLE     "../../mozilla/widget/src/build/res/none.cur"
 
+#endif
+
 // For some reason IDI_MAILBIFF needs to be larger than the value of IDI_APPLICATION for static builds
 #define IDI_MAILBIFF 101
 IDI_MAILBIFF  ICON  "../../mailnews/build/newmail.ico"
 
+// Program icon.
 #define IDI_APPICON 100
 IDI_APPICON  ICON  SEAMONKEY_ICO
-
-#endif