firefox-kde-114.patch
changeset 467 a9baaad57fa4
parent 223 4555a5d0d661
child 544 18fa86881f37
child 545 fcd8fb7c04dd
equal deleted inserted replaced
466:c0ae7c025b78 467:a9baaad57fa4
     1 # HG changeset patch
     1 # HG changeset patch
     2 # User Wolfgang Rosenauer <wr@rosenauer.org>
     2 # User Wolfgang Rosenauer <wr@rosenauer.org>
     3 # Parent 51bf77cf40165f6567ca7d9a5ff90286739e525a
     3 # Parent 0db25ab919ad61d91a46d7700d3f06e2b66f9feb
     4 With openSUSE 11.4 the desktop file name changed from MozillaFirefox to firefox
     4 With openSUSE 11.4 the desktop file name changed from MozillaFirefox to firefox
     5 
     5 
     6 diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js
     6 diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js
     7 --- a/browser/components/preferences/advanced.js
     7 --- a/browser/components/preferences/advanced.js
     8 +++ b/browser/components/preferences/advanced.js
     8 +++ b/browser/components/preferences/advanced.js
     9 @@ -705,17 +705,17 @@ var gAdvancedPane = {
     9 @@ -719,15 +719,15 @@ var gAdvancedPane = {
    10          shellSvc.setDefaultBrowser(true, false);
    10      if (kde_session == 1) {
    11          if (kde_session == 1) {
    11        var shellObj = Components.classes["@mozilla.org/file/local;1"]
    12            var shellObj = Components.classes["@mozilla.org/file/local;1"]
    12                                 .createInstance(Components.interfaces.nsILocalFile);
    13                                     .createInstance(Components.interfaces.nsILocalFile);
    13        shellObj.initWithPath("/usr/bin/kwriteconfig");
    14            shellObj.initWithPath("/usr/bin/kwriteconfig");
    14        var process = Components.classes["@mozilla.org/process/util;1"]
    15            var process = Components.classes["@mozilla.org/process/util;1"]
    15                                .createInstance(Components.interfaces.nsIProcess);
    16                                    .createInstance(Components.interfaces.nsIProcess);
    16        process.init(shellObj);
    17            process.init(shellObj);
    17        var args = ["--file", "kdeglobals", "--group", "General", "--key",
    18 -          var args = ["--file", "kdeglobals", "--group", "General", "--key", "BrowserApplication", "MozillaFirefox"];
    18 -          "BrowserApplication", "MozillaFirefox"];
    19 +          var args = ["--file", "kdeglobals", "--group", "General", "--key", "BrowserApplication", "firefox"];
    19 +          "BrowserApplication", "firefox"];
    20            process.run(false, args, args.length);
    20        process.run(false, args, args.length);
    21          }
       
    22        }
       
    23      }
    21      }
    24      else {
    22      document.getElementById("setDefaultPane").selectedIndex = 1;
    25        promptMessage = shellBundle.getFormattedString("alreadyDefaultBrowser",
    23    }
    26                                                       [brandShortName]);
    24  #endif
    27        psvc.alert(window, promptTitle, promptMessage);
    25  };