1212 { &kNS_SHELLSERVICE_CID, false, NULL, nsMacShellServiceConstructor }, |
1212 { &kNS_SHELLSERVICE_CID, false, NULL, nsMacShellServiceConstructor }, |
1213 #endif |
1213 #endif |
1214 diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js |
1214 diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js |
1215 --- a/browser/components/preferences/advanced.js |
1215 --- a/browser/components/preferences/advanced.js |
1216 +++ b/browser/components/preferences/advanced.js |
1216 +++ b/browser/components/preferences/advanced.js |
1217 @@ -22,16 +22,22 @@ var gAdvancedPane = { |
1217 @@ -23,16 +23,22 @@ var gAdvancedPane = { |
1218 if (extraArgs && extraArgs["advancedTab"]){ |
1218 if (extraArgs && extraArgs["advancedTab"]){ |
1219 advancedPrefs.selectedTab = document.getElementById(extraArgs["advancedTab"]); |
1219 advancedPrefs.selectedTab = document.getElementById(extraArgs["advancedTab"]); |
1220 } else { |
1220 } else { |
1221 var preference = document.getElementById("browser.preferences.advanced.selectedTabIndex"); |
1221 var preference = document.getElementById("browser.preferences.advanced.selectedTabIndex"); |
1222 if (preference.value !== null) |
1222 if (preference.value !== null) |
1235 #ifdef MOZ_UPDATER |
1235 #ifdef MOZ_UPDATER |
1236 this.updateReadPrefs(); |
1236 this.updateReadPrefs(); |
1237 #endif |
1237 #endif |
1238 this.updateOfflineApps(); |
1238 this.updateOfflineApps(); |
1239 #ifdef MOZ_CRASHREPORTER |
1239 #ifdef MOZ_CRASHREPORTER |
1240 @@ -705,12 +711,23 @@ var gAdvancedPane = { |
1240 @@ -715,12 +721,23 @@ var gAdvancedPane = { |
1241 /** |
|
1242 * Set browser as the operating system default browser. |
1241 * Set browser as the operating system default browser. |
1243 */ |
1242 */ |
1244 setDefaultBrowser: function() |
1243 setDefaultBrowser: function() |
1245 { |
1244 { |
1246 var shellSvc = Components.classes["@mozilla.org/browser/shell-service;1"] |
1245 let shellSvc = getShellService(); |
1247 .getService(Components.interfaces.nsIShellService); |
1246 if (!shellSvc) |
|
1247 return; |
1248 shellSvc.setDefaultBrowser(true, false); |
1248 shellSvc.setDefaultBrowser(true, false); |
1249 + if (kde_session == 1) { |
1249 + if (kde_session == 1) { |
1250 + var shellObj = Components.classes["@mozilla.org/file/local;1"] |
1250 + var shellObj = Components.classes["@mozilla.org/file/local;1"] |
1251 + .createInstance(Components.interfaces.nsILocalFile); |
1251 + .createInstance(Components.interfaces.nsILocalFile); |
1252 + shellObj.initWithPath("/usr/bin/kwriteconfig"); |
1252 + shellObj.initWithPath("/usr/bin/kwriteconfig"); |
1725 + |
1725 + |
1726 +#endif // nsunixshellservice_h____ |
1726 +#endif // nsunixshellservice_h____ |
1727 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1727 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1728 --- a/browser/installer/package-manifest.in |
1728 --- a/browser/installer/package-manifest.in |
1729 +++ b/browser/installer/package-manifest.in |
1729 +++ b/browser/installer/package-manifest.in |
1730 @@ -522,18 +522,20 @@ |
1730 @@ -520,18 +520,20 @@ |
1731 @BINPATH@/@PREF_DIR@/services-aitc.js |
1731 @BINPATH@/@PREF_DIR@/services-aitc.js |
1732 #endif |
1732 #endif |
1733 @BINPATH@/greprefs.js |
1733 @BINPATH@/greprefs.js |
1734 @BINPATH@/defaults/autoconfig/platform.js |
1734 @BINPATH@/defaults/autoconfig/platform.js |
1735 @BINPATH@/defaults/autoconfig/prefcalls.js |
1735 @BINPATH@/defaults/autoconfig/prefcalls.js |