diff -r c0ae7c025b78 -r a9baaad57fa4 firefox-kde-114.patch --- a/firefox-kde-114.patch Fri Jun 08 08:05:14 2012 +0200 +++ b/firefox-kde-114.patch Sat Jun 09 20:36:56 2012 +0200 @@ -1,27 +1,25 @@ # HG changeset patch # User Wolfgang Rosenauer -# Parent 51bf77cf40165f6567ca7d9a5ff90286739e525a +# Parent 0db25ab919ad61d91a46d7700d3f06e2b66f9feb 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 -@@ -705,17 +705,17 @@ var gAdvancedPane = { - shellSvc.setDefaultBrowser(true, false); - 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"]; -+ var args = ["--file", "kdeglobals", "--group", "General", "--key", "BrowserApplication", "firefox"]; - process.run(false, args, args.length); - } - } +@@ -719,15 +719,15 @@ 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); } - else { - promptMessage = shellBundle.getFormattedString("alreadyDefaultBrowser", - [brandShortName]); - psvc.alert(window, promptTitle, promptMessage); + document.getElementById("setDefaultPane").selectedIndex = 1; + } + #endif + };