Bug 598942 Followup to renumber icons to values that widget likes r+sr=bienvenu
authorNeil Rashbrook <neil@parkwaycc.co.uk>
Thu, 04 Nov 2010 21:39:43 +0000
changeset 6656 6ea0e2c0f1ed6b1ff1a85ac956e7cce4f4ba2723
parent 6655 67033a790980e896d2f6a599b24d2d20c50eb0a3
child 6657 2161775b088dcb7814d63e15ab63b72914c44ee5
push idunknown
push userunknown
push dateunknown
bugs598942
Bug 598942 Followup to renumber icons to values that widget likes r+sr=bienvenu
mail/app/splash.rc
mailnews/base/src/nsMessengerWinIntegration.cpp
suite/app/splash.rc
--- a/mail/app/splash.rc
+++ b/mail/app/splash.rc
@@ -79,15 +79,14 @@ IDC_ZOOMOUT             CURSOR  DISCARDA
 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
+#define IDI_MAILBIFF 32767
 IDI_MAILBIFF  ICON  "../../mailnews/build/newmail.ico"
 
 // Program icon.
-#define IDI_APPICON 100
-IDI_APPICON  ICON  THUNDERBIRD_ICO
+IDI_APPLICATION ICON THUNDERBIRD_ICO
 
--- a/mailnews/base/src/nsMessengerWinIntegration.cpp
+++ b/mailnews/base/src/nsMessengerWinIntegration.cpp
@@ -84,17 +84,17 @@
 
 #define XP_SHSetUnreadMailCounts "SHSetUnreadMailCountW"
 #define XP_SHEnumerateUnreadMailAccounts "SHEnumerateUnreadMailAccountsW"
 #define NOTIFICATIONCLASSNAME "MailBiffNotificationMessageWindow"
 #define UNREADMAILNODEKEY "Software\\Microsoft\\Windows\\CurrentVersion\\UnreadMail\\"
 #define SHELL32_DLL NS_LITERAL_CSTRING("shell32.dll")
 #define DOUBLE_QUOTE "\""
 #define MAIL_COMMANDLINE_ARG " -mail"
-#define IDI_MAILBIFF 101
+#define IDI_MAILBIFF 32767
 #define UNREAD_UPDATE_INTERVAL	(20 * 1000)	// 20 seconds
 #define ALERT_CHROME_URL "chrome://messenger/content/newmailalert.xul"
 #define NEW_MAIL_ALERT_ICON "chrome://messenger/skin/icons/new-mail-alert.png"
 #define SHOW_ALERT_PREF     "mail.biff.show_alert"
 #define SHOW_TRAY_ICON_PREF "mail.biff.show_tray_icon"
 
 // since we are including windows.h in this file, undefine get user name....
 #ifdef GetUserName
--- a/suite/app/splash.rc
+++ b/suite/app/splash.rc
@@ -75,14 +75,13 @@ IDC_ZOOMOUT             CURSOR  DISCARDA
 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
+#define IDI_MAILBIFF 32767
 IDI_MAILBIFF  ICON  "../../mailnews/build/newmail.ico"
 
 // Program icon.
-#define IDI_APPICON 100
-IDI_APPICON  ICON  SEAMONKEY_ICO
+IDI_APPLICATION ICON SEAMONKEY_ICO