firefox-kde-114.patch
author Wolfgang Rosenauer <wr@rosenauer.org>
Thu, 16 Oct 2014 23:09:58 +0200
changeset 779 354c672efefa
parent 545 fcd8fb7c04dd
permissions -rw-r--r--
rebased patches (KDE patches likely not complete yet and not building)
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
223
4555a5d0d661 patch reorganization
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     1
# HG changeset patch
4555a5d0d661 patch reorganization
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     2
# User Wolfgang Rosenauer <wr@rosenauer.org>
779
354c672efefa rebased patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 545
diff changeset
     3
# Parent a5921092e6fb2dc39b1426139eb8406f5fd3cfa9
223
4555a5d0d661 patch reorganization
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     4
With openSUSE 11.4 the desktop file name changed from MozillaFirefox to firefox
4555a5d0d661 patch reorganization
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     5
779
354c672efefa rebased patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 545
diff changeset
     6
diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js
354c672efefa rebased patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 545
diff changeset
     7
--- a/browser/components/preferences/main.js
354c672efefa rebased patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 545
diff changeset
     8
+++ b/browser/components/preferences/main.js
354c672efefa rebased patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 545
diff changeset
     9
@@ -511,17 +511,17 @@ var gMainPane = {
354c672efefa rebased patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 545
diff changeset
    10
       if (kde_session == 1) {
354c672efefa rebased patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 545
diff changeset
    11
         var shellObj = Components.classes["@mozilla.org/file/local;1"]
354c672efefa rebased patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 545
diff changeset
    12
                                  .createInstance(Components.interfaces.nsILocalFile);
354c672efefa rebased patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 545
diff changeset
    13
         shellObj.initWithPath("/usr/bin/kwriteconfig");
354c672efefa rebased patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 545
diff changeset
    14
         var process = Components.classes["@mozilla.org/process/util;1"]
354c672efefa rebased patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 545
diff changeset
    15
                                 .createInstance(Components.interfaces.nsIProcess);
354c672efefa rebased patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 545
diff changeset
    16
         process.init(shellObj);
354c672efefa rebased patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 545
diff changeset
    17
         var args = ["--file", "kdeglobals", "--group", "General", "--key",
354c672efefa rebased patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 545
diff changeset
    18
-            "BrowserApplication", "MozillaFirefox"];
354c672efefa rebased patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 545
diff changeset
    19
+            "BrowserApplication", "firefox"];
354c672efefa rebased patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 545
diff changeset
    20
         process.run(false, args, args.length);
354c672efefa rebased patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 545
diff changeset
    21
       }
354c672efefa rebased patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 545
diff changeset
    22
     } catch (ex) {
354c672efefa rebased patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 545
diff changeset
    23
       Components.utils.reportError(ex);
354c672efefa rebased patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 545
diff changeset
    24
       return;
223
4555a5d0d661 patch reorganization
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    25
     }
545
fcd8fb7c04dd rebase patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 467
diff changeset
    26
     let selectedIndex =
fcd8fb7c04dd rebase patches
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 467
diff changeset
    27
       shellSvc.isDefaultBrowser(false, true) ? 1 : 0;