Bug #245430 --> Port more thunderbird static build work to the trunk

mail/app/Makefile.in

@@ -75,8 +75,9 @@ LIBS = \
 	$(EXTRA_DSO_LIBS) \
 	$(DIST)/lib/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX) \
 	$(MOZ_JS_LIBS) \
-	$(MOZ_COMPONENT_LIBS) \
 	$(TK_LIBS) \
+	$(XPCOM_LIBS) \
+	$(NSPR_LIBS) \
 	$(NULL)
 
 ifdef MOZ_JPROF

mail/app/splash.rc

@@ -40,33 +40,21 @@
 
 1 24 "thunderbird.exe.manifest" 
 
-// Splash screen dialog ID.
-#define IDD_SPLASH  100
- 
-// Splash screen bitmap ID.
-#define IDB_SPLASH  101
- 
-// DDE application name
-#define ID_DDE_APPLICATION_NAME 102
-
 // Program icon.
 IDI_APPLICATION ICON THUNDERBIRD_ICO
 
-// Splash screen dialog.
-IDD_SPLASH DIALOGEX
-	DISCARDABLE
-	0,0,0,0
-	STYLE DS_SETFOREGROUND | DS_CENTER | WS_POPUP
-    EXSTYLE WS_EX_TOOLWINDOW
-	FONT 8, "MS Sans Serif"
-	BEGIN
-		CONTROL
-            IDB_SPLASH,
-			IDB_SPLASH,
-			"Static",
-			SS_BITMAP,
-			0,0,0,0
-	END
+#define ID_DDE_APPLICATION_NAME 102
+
+STRINGTABLE DISCARDABLE
+BEGIN
+#ifdef DEBUG
+    ID_DDE_APPLICATION_NAME,            "Thunderbird Debug"
+    IDS_STARTMENU_APPNAME,              "Thunderbird Debug"
+#else
+    ID_DDE_APPLICATION_NAME,            "Thunderbird"
+    IDS_STARTMENU_APPNAME,              "Thunderbird"
+#endif
+END
 
 #ifdef MOZ_STATIC_BUILD
 
@@ -88,13 +76,11 @@ IDC_ZOOMIN       CURSOR DISCARDABLE "..\\..\\widget\\src\\build\\res\\zoom_in.cu
 IDC_ZOOMOUT      CURSOR DISCARDABLE "..\\..\\widget\\src\\build\\res\\zoom_out.cur"
 
 // For some reason IDI_MAILBIFF needs to be larger than the value of IDI_APPLICATION for static builds
-#define IDI_MAILBIFF 32520
+#define IDI_MAILBIFF 101
 IDI_MAILBIFF  ICON  "..\\..\\mailnews\\build\\newmail.ico"
 
+#define IDI_APPICON 100
+IDI_APPICON  ICON  THUNDERBIRD_ICO
+
 #endif
 
-STRINGTABLE DISCARDABLE
-BEGIN
-    ID_DDE_APPLICATION_NAME,            "Thunderbird"
-    IDS_STARTMENU_APPNAME,              "Thunderbird"
-END

mailnews/base/src/nsMessengerWinIntegration.cpp

@@ -79,11 +79,7 @@
 #define MAIL_COMMANDLINE_ARG " -mail"
 #define TIMER_INTERVAL_PREF "mail.windows_xp_integration.unread_count_interval"
 
-#ifdef MOZ_STATIC_BUILD
-#define IDI_MAILBIFF 32520
-#else
 #define IDI_MAILBIFF 101
-#endif
 
 #define NEW_MAIL_ALERT_ICON "chrome://messenger/skin/icons/new-mail-alert.png"
 #define SHOW_ALERT_PREF "mail.biff.show_alert"