Bug 364168 Winhooks commandline options won't work in suiterunner - remove winhooks now that shell service is implemented. r/sr=Neil
authorMark Banner <bugzilla@standard8.plus.com>
Thu, 04 Sep 2008 17:14:32 +0100
changeset 258 4e64b9298751d564e739456d37f722e931693f19
parent 257 9cc1aca930cce8415e6dcf96dc19f4bcf847ae89
child 259 f217309d16c03ce54ff6ae125c2ba443a9be1162
push idunknown
push userunknown
push dateunknown
bugs364168
Bug 364168 Winhooks commandline options won't work in suiterunner - remove winhooks now that shell service is implemented. r/sr=Neil
suite/common/nsContextMenu.js
suite/installer/removed-files.in
suite/installer/windows/packages
--- a/suite/common/nsContextMenu.js
+++ b/suite/common/nsContextMenu.js
@@ -707,20 +707,22 @@ nsContextMenu.prototype = {
       var buttonPressed = promptService.confirmEx(window, promptTitle, promptMsg,
                                                    (promptService.BUTTON_TITLE_IS_STRING * promptService.BUTTON_POS_0) +
                                                    (promptService.BUTTON_TITLE_CANCEL    * promptService.BUTTON_POS_1),
                                                    promptConfirmButton, null, null, null, {value:0});
  
       if (buttonPressed != 0)
         return;
 
-      var winhooks = Components.classes[ "@mozilla.org/winhooks;1" ].
-                       getService(Components.interfaces.nsIWindowsHooks);
-      
-      winhooks.setImageAsWallpaper(this.target, false);
+      const nsIShellService = Components.interfaces.nsIShellService;
+
+      Components.classes["@mozilla.org/suite/shell-service;1"]
+                .getService(nsIShellService)
+                .setDesktopBackground(this.target,
+                                      nsIShellService.BACKGROUND_STRETCH);
     },    
     // Save URL of clicked-on frame.
     saveFrame : function () {
         saveDocument( this.target.ownerDocument );
     },
     // Save URL of clicked-on link.
     saveLink : function () {
         saveURL( this.linkURL(), this.linkText(), null, true,
--- a/suite/installer/removed-files.in
+++ b/suite/installer/removed-files.in
@@ -61,22 +61,26 @@ components/@DLL_PREFIX@bookmark@DLL_SUFF
 components/bookmarks.xpt
 components/chatzilla-service.js
 components/crashreporter.xpt
 components/nsCloseAllWindows.js
 components/nsDictionary.js
 components/nsKillAll.js
 components/nsResetPref.js
 components/nsScriptableIO.js
+components/nsSetDefaultBrowser.js
+components/nsSetDefaultMail.js
+components/nsUnsetDefaultMail.js
 components/nsXmlRpcClient.js
 components/search.xpt
 components/@DLL_PREFIX@srchsvc@DLL_SUFFIX@
 components/urlwidgt.xpt
 components/venkman-service.js
 components/@DLL_PREFIX@xmlextras@DLL_SUFFIX@
+components/winhooks.xpt
 components/xml-rpc.xpt
 @DLL_PREFIX@xpistub@DLL_SUFFIX@
 res/cmessage.txt
 LICENSE
 #ifdef XP_WIN
 #ifdef MOZ_MEMORY
 Microsoft.VC80.CRT.manifest
 msvcm80.dll
--- a/suite/installer/windows/packages
+++ b/suite/installer/windows/packages
@@ -224,17 +224,16 @@ bin\components\walletpreview.xpt
 bin\components\webBrowser_core.xpt
 bin\components\webbrowserpersist.xpt
 bin\components\webbrwsr.dll
 bin\components\webshell_idls.xpt
 bin\components\widget.xpt
 bin\components\windowds.dll
 bin\components\windowds.xpt
 bin\components\windowwatcher.xpt
-bin\components\winhooks.xpt
 bin\components\wlltvwrs.dll
 bin\components\xpautoc.dll
 bin\components\xpautocomplete.xpt
 bin\components\xpc3250.dll
 bin\components\xpcom_base.xpt
 bin\components\xpcom_components.xpt
 bin\components\xpcom_ds.xpt
 bin\components\xpcom_io.xpt
@@ -272,17 +271,16 @@ bin\components\nsContentPrefService.js
 bin\components\nsExtensionManager.js
 bin\components\nsInterfaceInfoToIDL.js
 bin\components\nsLoginInfo.js
 bin\components\nsLoginManager.js
 bin\components\nsLoginManagerPrompter.js
 bin\components\nsPostUpdateWin.js
 bin\components\nsProxyAutoConfig.js
 bin\components\nsSetDefault.js
-bin\components\nsSetDefaultBrowser.js
 bin\components\nsSidebar.js
 bin\components\nsSuiteGlue.js
 bin\components\nsUpdateService.js
 bin\components\nsURLFormatter.js
 bin\components\pluginGlue.js
 bin\components\storage-Legacy.js
 bin\components\txEXSLTRegExFunctions.js
 bin\components\nsAboutAbout.js
@@ -508,18 +506,16 @@ bin\components\mailview.xpt
 bin\components\msgsmime.dll
 bin\components\msgsmime.xpt
 bin\components\smime-service.js
 bin\MapiProxy.dll
 bin\mozMapi32.dll
 bin\components\msgMapi.dll
 bin\components\mapihook.xpt
 bin\components\mdn-service.js
-bin\components\nsSetDefaultMail.js
-bin\components\nsUnsetDefaultMail.js
 bin\components\offlineStartup.js
 
 [chatzilla]
 bin\extensions\{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}\components\chatzilla-service.js
 bin\extensions\{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}\chrome\chatzilla.jar
 bin\extensions\{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}\chrome\icons\default\chatzilla-window.ico
 bin\extensions\{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}\chrome.manifest
 bin\extensions\{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}\install.rdf