firefox-kde-114.patch
author Wolfgang Rosenauer <wr@rosenauer.org>
Wed, 26 Jan 2011 16:43:00 +0100
changeset 223 4555a5d0d661
child 467 a9baaad57fa4
permissions -rw-r--r--
patch reorganization fix desktop file naming for 11.4/KDE
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>
4555a5d0d661 patch reorganization
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     3
# Parent 51bf77cf40165f6567ca7d9a5ff90286739e525a
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
4555a5d0d661 patch reorganization
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     6
diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js
4555a5d0d661 patch reorganization
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     7
--- a/browser/components/preferences/advanced.js
4555a5d0d661 patch reorganization
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     8
+++ b/browser/components/preferences/advanced.js
4555a5d0d661 patch reorganization
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     9
@@ -705,17 +705,17 @@ var gAdvancedPane = {
4555a5d0d661 patch reorganization
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    10
         shellSvc.setDefaultBrowser(true, false);
4555a5d0d661 patch reorganization
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    11
         if (kde_session == 1) {
4555a5d0d661 patch reorganization
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    12
           var shellObj = Components.classes["@mozilla.org/file/local;1"]
4555a5d0d661 patch reorganization
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    13
                                    .createInstance(Components.interfaces.nsILocalFile);
4555a5d0d661 patch reorganization
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    14
           shellObj.initWithPath("/usr/bin/kwriteconfig");
4555a5d0d661 patch reorganization
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    15
           var process = Components.classes["@mozilla.org/process/util;1"]
4555a5d0d661 patch reorganization
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    16
                                   .createInstance(Components.interfaces.nsIProcess);
4555a5d0d661 patch reorganization
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    17
           process.init(shellObj);
4555a5d0d661 patch reorganization
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    18
-          var args = ["--file", "kdeglobals", "--group", "General", "--key", "BrowserApplication", "MozillaFirefox"];
4555a5d0d661 patch reorganization
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    19
+          var args = ["--file", "kdeglobals", "--group", "General", "--key", "BrowserApplication", "firefox"];
4555a5d0d661 patch reorganization
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    20
           process.run(false, args, args.length);
4555a5d0d661 patch reorganization
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    21
         }
4555a5d0d661 patch reorganization
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    22
       }
4555a5d0d661 patch reorganization
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    23
     }
4555a5d0d661 patch reorganization
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    24
     else {
4555a5d0d661 patch reorganization
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    25
       promptMessage = shellBundle.getFormattedString("alreadyDefaultBrowser",
4555a5d0d661 patch reorganization
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    26
                                                      [brandShortName]);
4555a5d0d661 patch reorganization
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    27
       psvc.alert(window, promptTitle, promptMessage);