firefox-kde.patch
changeset 545 fcd8fb7c04dd
parent 541 830e50bbfc79
child 548 55cd16b450d2
--- a/firefox-kde.patch	Sat Sep 15 23:24:13 2012 +0200
+++ b/firefox-kde.patch	Thu Oct 04 06:53:00 2012 +0200
@@ -1369,13 +1369,13 @@
 +
  #ifdef HAVE_SHELL_SERVICE
      this.updateSetDefaultBrowser();
- #endif
- #ifdef MOZ_UPDATER
-     this.updateReadPrefs();
- #endif
-     this.updateOfflineApps();
- #ifdef MOZ_CRASHREPORTER
-@@ -715,12 +721,23 @@ var gAdvancedPane = {
+ #ifdef XP_WIN
+     let shellSvc = getShellService();
+     // In Windows 8 we launch the control panel since it's the only
+     // way to get all file type association prefs. So we don't know
+     // when the user will select the default.  We refresh here periodically
+     // in case the default changes. 
+@@ -737,14 +743,25 @@ var gAdvancedPane = {
     * Set browser as the operating system default browser.
     */
    setDefaultBrowser: function()
@@ -1395,7 +1395,9 @@
 +          "BrowserApplication", "MozillaFirefox"];
 +      process.run(false, args, args.length);
 +    }
-     document.getElementById("setDefaultPane").selectedIndex = 1;
+     let selectedIndex =
+       shellSvc.isDefaultBrowser(false, true) ? 1 : 0;
+     document.getElementById("setDefaultPane").selectedIndex = selectedIndex;
    }
  #endif
  };