Bug 598942 No new mail icon in fatlibxul builds r=bienvenu sr=Standard8

mail/app/splash.rc

@@ -40,9 +40,6 @@
 
 1 24 "thunderbird.exe.manifest" 
 
-// Program icon.
-IDI_APPLICATION ICON THUNDERBIRD_ICO
-
 STRINGTABLE DISCARDABLE
 BEGIN
 #ifdef DEBUG
@@ -84,12 +81,13 @@ IDC_ROWRESIZE           CURSOR  DISCARDABLE     "../../mozilla/widget/src/build/
 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
-

mailnews/base/build/Makefile.in

@@ -44,9 +44,6 @@ 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

mailnews/base/build/mail.rc

@@ -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"
-/////////////////////////////////////////////////////////////////////////////

mailnews/base/build/resource.h

@@ -1,2 +0,0 @@
-#define IDI_MAILBIFF 101
-

mailnews/base/src/nsMessengerWinIntegration.cpp

@@ -314,23 +314,13 @@ NOTIFYICONDATAW sBiffIconData = { sizeof(NOTIFYICONDATAW),
 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;
 }

mailnews/build/Makefile.in

@@ -45,12 +45,6 @@ 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

mailnews/build/mail.rc

@@ -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"
-/////////////////////////////////////////////////////////////////////////////

mailnews/build/resource.h

@@ -1,2 +0,0 @@
-#define IDI_MAILBIFF 101
-

suite/app/splash.rc

@@ -40,9 +40,6 @@
 
 1 24 "seamonkey.exe.manifest"
 
-// Program icon.
-IDI_APPLICATION ICON SEAMONKEY_ICO
-
 STRINGTABLE DISCARDABLE
 BEGIN
 	IDS_STARTMENU_APPNAME,              "@MOZ_APP_DISPLAYNAME@"
@@ -80,11 +77,12 @@ IDC_ROWRESIZE           CURSOR  DISCARDABLE     "../../mozilla/widget/src/build/
 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