Hello community, here is the log from the commit of package MozillaFirefox for openSUSE:Factory checked in at Fri Aug 21 17:38:37 CEST 2009. -------- --- MozillaFirefox/MozillaFirefox.changes 2009-08-09 09:16:26.000000000 +0200 +++ MozillaFirefox/MozillaFirefox.changes 2009-08-19 22:16:46.000000000 +0200 @@ -1,0 +2,9 @@ +Wed Aug 19 22:14:07 CEST 2009 - wr@rosenauer.org + +- renamed patch firefox-contextmenu-gnome to firefox-cross-desktop + as it contains more tweaks to handle non-Gnome environments and + especially KDE integration: + * added the ability to set the KDE default browser + (still part of bnc#170055) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- firefox-contextmenu-gnome.patch New: ---- firefox-cross-desktop.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaFirefox.spec ++++++ --- /var/tmp/diff_new_pack.dzXgJ2/_old 2009-08-21 17:38:03.000000000 +0200 +++ /var/tmp/diff_new_pack.dzXgJ2/_new 2009-08-21 17:38:03.000000000 +0200 @@ -29,7 +29,7 @@ Provides: web_browser Provides: firefox Version: 3.5.2 -Release: 2 +Release: 3 Summary: Mozilla Firefox Web Browser Url: http://www.mozilla.org/ Group: Productivity/Networking/Web/Browsers @@ -49,7 +49,7 @@ Patch3: toolkit-download-folder.patch Patch4: mozilla-linkorder.patch Patch5: firefox-bug506901.patch -Patch6: firefox-contextmenu-gnome.patch +Patch6: firefox-cross-desktop.patch Patch14: credits.patch Patch17: firefox-appname.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ firefox-cross-desktop.patch ++++++ From: Wolfgang Rosenauer Subject: NonGnome/KDE integration References: https://bugzilla.novell.com/show_bug.cgi?id=170055 Caveats: desktop file name of Firefox is hardcoded to MozillaFirefox diff --git a/browser/base/content/nsContextMenu.js b/browser/base/content/nsContextMenu.js --- a/browser/base/content/nsContextMenu.js +++ b/browser/base/content/nsContextMenu.js @@ -210,13 +210,15 @@ nsContextMenu.prototype = { // Set as Desktop background depends on whether an image was clicked on, // and only works if we have a shell service. var haveSetDesktopBackground = false; #ifdef HAVE_SHELL_SERVICE // Only enable Set as Desktop Background if we can get the shell service. var shell = getShellService(); - if (shell) + var env = Components.classes["@mozilla.org/process/environment;1"] + .getService(Components.interfaces.nsIEnvironment); + if (shell && env.get('DESKTOP_SESSION') == "gnome") haveSetDesktopBackground = true; #endif this.showItem("context-setDesktopBackground", haveSetDesktopBackground && this.onLoadedImage); if (haveSetDesktopBackground && this.onLoadedImage) { 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 @@ -594,20 +594,38 @@ var gAdvancedPane = { var brandShortName = brandBundle.getString("brandShortName"); var promptTitle = shellBundle.getString("setDefaultBrowserTitle"); var promptMessage; const IPS = Components.interfaces.nsIPromptService; var psvc = Components.classes["@mozilla.org/embedcomp/prompt-service;1"] .getService(IPS); + + var env = Components.classes["@mozilla.org/process/environment;1"] + .getService(Components.interfaces.nsIEnvironment); + var kde_session = 0; + if (env.get('KDE_FULL_SESSION') == "true") + kde_session = 1; + if (!shellSvc.isDefaultBrowser(false)) { promptMessage = shellBundle.getFormattedString("setDefaultBrowserMessage", [brandShortName]); var rv = psvc.confirmEx(window, promptTitle, promptMessage, IPS.STD_YES_NO_BUTTONS, null, null, null, null, { }); - if (rv == 0) + if (rv == 0) { 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"]; + process.run(false, args, args.length); + } + } } else { promptMessage = shellBundle.getFormattedString("alreadyDefaultBrowser", [brandShortName]); psvc.alert(window, promptTitle, promptMessage); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org