# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1349326380 -7200
# Node ID fcd8fb7c04dd01b97dedfdf5fb3b1e69ce6c2f30
# Parent  24c3eafd49a1b8847b4d2d426a2cc478dcf1ce68
rebase patches

diff -r 24c3eafd49a1 -r fcd8fb7c04dd firefox-kde-114.patch
--- a/firefox-kde-114.patch	Sat Sep 15 23:24:13 2012 +0200
+++ b/firefox-kde-114.patch	Thu Oct 04 06:53:00 2012 +0200
@@ -1,12 +1,12 @@
 # HG changeset patch
 # User Wolfgang Rosenauer <wr@rosenauer.org>
-# Parent 0db25ab919ad61d91a46d7700d3f06e2b66f9feb
+# Parent ba2d9b1374e15e7c339a44452169d0afac2ca82e
 With openSUSE 11.4 the desktop file name changed from MozillaFirefox to firefox
 
 diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js
 --- a/browser/components/preferences/advanced.js
 +++ b/browser/components/preferences/advanced.js
-@@ -719,15 +719,15 @@ var gAdvancedPane = {
+@@ -751,17 +751,17 @@ var gAdvancedPane = {
      if (kde_session == 1) {
        var shellObj = Components.classes["@mozilla.org/file/local;1"]
                                 .createInstance(Components.interfaces.nsILocalFile);
@@ -19,7 +19,9 @@
 +          "BrowserApplication", "firefox"];
        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
  };
diff -r 24c3eafd49a1 -r fcd8fb7c04dd firefox-kde.patch
--- 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
  };