Bug 747774 The Windows 7 Jumplist is using the mailbiff icon, should use html-file.ico instead r=Neil.
authorPhilip Chee <philip.chee@gmail.com>
Mon, 23 Apr 2012 12:26:37 +0800
changeset 11694 2cbb85b289f56133378ae30e52edeacef4cfed19
parent 11693 e82a34c7dcca82f09b6de9618e5c16863d40b65b
child 11695 9427206297feffc445f6fd1139d105443acf9c88
push idunknown
push userunknown
push dateunknown
reviewersNeil
bugs747774, 684155, 737841
Bug 747774 The Windows 7 Jumplist is using the mailbiff icon, should use html-file.ico instead r=Neil. Also ports: Bug 684155 (Remove MOZ_STATIC_BUILD) Bug 737841 Part 3 (remove no more useful redirectsMode query option)
suite/app/Makefile.in
suite/app/splash.rc
suite/branding/nightly/Makefile.in
suite/modules/WindowsJumpLists.jsm
--- a/suite/app/Makefile.in
+++ b/suite/app/Makefile.in
@@ -41,16 +41,17 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 AB_CD = $(MOZ_UI_LOCALE) 
 
 DEFINES += \
 	-DSEAMONKEY_ICO=\"$(DIST)/branding/seamonkey.ico\" \
+	-DHTML_FILE_ICO=\"$(DIST)/branding/html-file.ico\" \
 	-DAPP_VERSION="$(MOZ_APP_VERSION)" \
 	-DNO_BLOCKLIST_CRASHREPORTER \
 	$(NULL)
 
 ifdef LIBXUL_SDK
 include $(topsrcdir)/config/rules.mk
 else
 # Build a binary bootstrapping with XRE_main
--- a/suite/app/splash.rc
+++ b/suite/app/splash.rc
@@ -40,48 +40,17 @@
 
 1 24 "seamonkey.exe.manifest"
 
 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
-// for the limitation that only one resource file can be used in an .exe.  We
-// should develop a method, for static builds only, to combine multiple .rc
-// files into a single .rc file, and then use that to build the single .res
-// file for the .exe.
-
-#define IDC_GRAB                        4101
-#define IDC_GRABBING                    4102
-#define IDC_CELL                        4103
-#define IDC_COPY                        4104
-#define IDC_ALIAS                       4105
-#define IDC_ZOOMIN                      4106
-#define IDC_ZOOMOUT                     4107
-#define IDC_COLRESIZE                   4108
-#define IDC_ROWRESIZE                   4109
-#define IDC_VERTICALTEXT                4110
-#define IDC_NONE                        4112
-
-IDC_GRAB                CURSOR  DISCARDABLE     "../../mozilla/widget/src/build/res/grab.cur"
-IDC_GRABBING            CURSOR  DISCARDABLE     "../../mozilla/widget/src/build/res/grabbing.cur"
-IDC_CELL                CURSOR  DISCARDABLE     "../../mozilla/widget/src/build/res/cell.cur"
-IDC_COPY                CURSOR  DISCARDABLE     "../../mozilla/widget/src/build/res/copy.cur"
-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
-
 // Program icon.
 IDI_APPLICATION ICON SEAMONKEY_ICO
 
 // For some reason IDI_MAILBIFF needs to be larger than the value of IDI_APPLICATION for static builds
 #define IDI_MAILBIFF 32576
 IDI_MAILBIFF  ICON  "../../mailnews/build/newmail.ico"
+
+#define IDI_HTMLFILE 32577
+IDI_HTMLFILE ICON HTML_FILE_ICO
--- a/suite/branding/nightly/Makefile.in
+++ b/suite/branding/nightly/Makefile.in
@@ -116,16 +116,17 @@ GARBAGE	+= $(addprefix $(DIST)/bin/chrom
 endif
 
 include $(topsrcdir)/config/rules.mk
 
 export::
 	$(NSINSTALL) -D $(DIST)/branding
 ifeq ($(OS_ARCH),WINNT)
 	cp $(srcdir)/icons/windows/seamonkey.ico      $(DIST)/branding/seamonkey.ico
+	cp $(srcdir)/icons/windows/html-file.ico      $(DIST)/branding/html-file.ico
 	cp $(srcdir)/package/windows/branding.nsi     $(DIST)/branding/branding.nsi
 	cp $(srcdir)/package/windows/wizHeader.bmp    $(DIST)/branding/wizHeader.bmp
 	cp $(srcdir)/package/windows/wizHeaderRTL.bmp $(DIST)/branding/wizHeaderRTL.bmp
 	cp $(srcdir)/package/windows/wizWatermark.bmp $(DIST)/branding/wizWatermark.bmp
 endif
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 	$(NSINSTALL) -D $(DIST)/branding
 	$(NSINSTALL) -D $(DIST)/branding/icons
--- a/suite/modules/WindowsJumpLists.jsm
+++ b/suite/modules/WindowsJumpLists.jsm
@@ -382,17 +382,17 @@ var WinTaskbarJumpList =
           delete this._pendingStatements[LIST_TYPE.FREQUENT];
           // The are no more results, build the list.
           this._buildCustom(_getString("taskbar.frequent.label"), items);
           this._commitBuild();
           return;
         }
 
         let title = aResult.title || aResult.uri;
-        let shortcut = this._getHandlerAppItem(title, title, aResult.uri, 1);
+        let shortcut = this._getHandlerAppItem(title, title, aResult.uri, 2);
         items.appendElement(shortcut, false);
         this._frequentHashList.push(aResult.uri);
       },
       this
     );
   },
 
   _buildRecent: function WTBJL__buildRecent() {
@@ -425,17 +425,17 @@ var WinTaskbarJumpList =
 
         // Do not add items to recent that have already been added to frequent.
         if (this._frequentHashList &&
             this._frequentHashList.indexOf(aResult.uri) != -1) {
           return;
         }
 
         let title = aResult.title || aResult.uri;
-        let shortcut = this._getHandlerAppItem(title, title, aResult.uri, 1);
+        let shortcut = this._getHandlerAppItem(title, title, aResult.uri, 2);
         items.appendElement(shortcut, false);
         count++;
       },
       this
     );
   },
 
   _deleteActiveJumpList: function WTBJL__deleteAJL() {
@@ -478,18 +478,16 @@ var WinTaskbarJumpList =
    * Nav history helpers
    */
 
   _getHistoryResults:
   function WTBLJL__getHistoryResults(aSortingMode, aLimit, aCallback, aScope) {
     var options = PlacesUtils.history.getNewQueryOptions();
     options.maxResults = aLimit;
     options.sortingMode = aSortingMode;
-    // We don't want source redirects for these queries.
-    options.redirectsMode = Ci.nsINavHistoryQueryOptions.REDIRECTS_MODE_TARGET;
     var query = PlacesUtils.history.getNewQuery();
 
     // Return the pending statement to the caller, to allow cancelation.
     return PlacesUtils.history.QueryInterface(Ci.nsPIPlacesDatabase)
                               .asyncExecuteLegacyQueries([query], 1, options, {
       handleResult: function (aResultSet) {
         for (let row; (row = aResultSet.getNextRow());) {
           try {