firefox-kde-114.patch
changeset 779 354c672efefa
parent 545 fcd8fb7c04dd
--- a/firefox-kde-114.patch	Thu Oct 16 21:20:22 2014 +0200
+++ b/firefox-kde-114.patch	Thu Oct 16 23:09:58 2014 +0200
@@ -1,27 +1,27 @@
 # HG changeset patch
 # User Wolfgang Rosenauer <wr@rosenauer.org>
-# Parent ba2d9b1374e15e7c339a44452169d0afac2ca82e
+# Parent a5921092e6fb2dc39b1426139eb8406f5fd3cfa9
 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
-@@ -751,17 +751,17 @@ var gAdvancedPane = {
-     if (kde_session == 1) {
-       var shellObj = Components.classes["@mozilla.org/file/local;1"]
-                                .createInstance(Components.interfaces.nsILocalFile);
-       shellObj.initWithPath("/usr/bin/kwriteconfig");
-       var process = Components.classes["@mozilla.org/process/util;1"]
-                               .createInstance(Components.interfaces.nsIProcess);
-       process.init(shellObj);
-       var args = ["--file", "kdeglobals", "--group", "General", "--key",
--          "BrowserApplication", "MozillaFirefox"];
-+          "BrowserApplication", "firefox"];
-       process.run(false, args, args.length);
+diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js
+--- a/browser/components/preferences/main.js
++++ b/browser/components/preferences/main.js
+@@ -511,17 +511,17 @@ var gMainPane = {
+       if (kde_session == 1) {
+         var shellObj = Components.classes["@mozilla.org/file/local;1"]
+                                  .createInstance(Components.interfaces.nsILocalFile);
+         shellObj.initWithPath("/usr/bin/kwriteconfig");
+         var process = Components.classes["@mozilla.org/process/util;1"]
+                                 .createInstance(Components.interfaces.nsIProcess);
+         process.init(shellObj);
+         var args = ["--file", "kdeglobals", "--group", "General", "--key",
+-            "BrowserApplication", "MozillaFirefox"];
++            "BrowserApplication", "firefox"];
+         process.run(false, args, args.length);
+       }
+     } catch (ex) {
+       Components.utils.reportError(ex);
+       return;
      }
      let selectedIndex =
        shellSvc.isDefaultBrowser(false, true) ? 1 : 0;
-     document.getElementById("setDefaultPane").selectedIndex = selectedIndex;
-   }
- #endif
- };