Bug 237745 (app-startup) - split off the pieces of appshellservice that have to do with the startup sequence into a new (forked, temporarily) app-startup service r+sr=darin+biesi+Neil

suite/common/pref/pref-advanced.xul

@@ -129,11 +129,11 @@
           winhooksService.startupAddOption("-turbo");
         else 
           winhooksService.startupRemoveOption("-turbo");
-        var appShell = Components.classes['@mozilla.org/appshell/appShellService;1'].getService();
-        appShell = appShell.QueryInterface( Components.interfaces.nsIAppShellService );
+        var appStartup = Components.classes["@mozilla.org/toolkit/app-startup;1"].
+                           getService(Components.interfaces.nsIAppStartup);
         var nativeAppSupport = null;
         try {
-          nativeAppSupport = appShell.nativeAppSupport;
+          nativeAppSupport = appStartup.nativeAppSupport;
         }
         catch ( ex ) {
         }

suite/common/pref/pref-themes.js

@@ -118,10 +118,10 @@ function applySkin()
   parent.hPrefWindow.setPref("string", "general.skins.selectedSkin", data.name);
 
   // shut down quicklaunch so the next launch will have the new skin
-  var appShell = Components.classes['@mozilla.org/appshell/appShellService;1'].getService();
-  appShell = appShell.QueryInterface(Components.interfaces.nsIAppShellService);
+  var appStartup = Components.classes["@mozilla.org/toolkit/app-startup;1"]
+                     .getService(Components.interfaces.nsIAppStartup);
   try {
-    appShell.nativeAppSupport.isServerMode = false;
+    appStartup.nativeAppSupport.isServerMode = false;
   }
   catch(ex) {
   }