1296 { &kNS_SHELLSERVICE_CID, false, NULL, nsMacShellServiceConstructor }, |
1296 { &kNS_SHELLSERVICE_CID, false, NULL, nsMacShellServiceConstructor }, |
1297 #endif |
1297 #endif |
1298 diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js |
1298 diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js |
1299 --- a/browser/components/preferences/advanced.js |
1299 --- a/browser/components/preferences/advanced.js |
1300 +++ b/browser/components/preferences/advanced.js |
1300 +++ b/browser/components/preferences/advanced.js |
1301 @@ -22,16 +22,22 @@ var gAdvancedPane = { |
1301 @@ -23,16 +23,22 @@ var gAdvancedPane = { |
1302 if (extraArgs && extraArgs["advancedTab"]){ |
1302 if (extraArgs && extraArgs["advancedTab"]){ |
1303 advancedPrefs.selectedTab = document.getElementById(extraArgs["advancedTab"]); |
1303 advancedPrefs.selectedTab = document.getElementById(extraArgs["advancedTab"]); |
1304 } else { |
1304 } else { |
1305 var preference = document.getElementById("browser.preferences.advanced.selectedTabIndex"); |
1305 var preference = document.getElementById("browser.preferences.advanced.selectedTabIndex"); |
1306 if (preference.value !== null) |
1306 if (preference.value !== null) |
1319 #ifdef MOZ_UPDATER |
1319 #ifdef MOZ_UPDATER |
1320 this.updateReadPrefs(); |
1320 this.updateReadPrefs(); |
1321 #endif |
1321 #endif |
1322 this.updateOfflineApps(); |
1322 this.updateOfflineApps(); |
1323 #ifdef MOZ_CRASHREPORTER |
1323 #ifdef MOZ_CRASHREPORTER |
1324 @@ -705,12 +711,23 @@ var gAdvancedPane = { |
1324 @@ -715,12 +721,23 @@ var gAdvancedPane = { |
1325 /** |
|
1326 * Set browser as the operating system default browser. |
1325 * Set browser as the operating system default browser. |
1327 */ |
1326 */ |
1328 setDefaultBrowser: function() |
1327 setDefaultBrowser: function() |
1329 { |
1328 { |
1330 var shellSvc = Components.classes["@mozilla.org/browser/shell-service;1"] |
1329 let shellSvc = getShellService(); |
1331 .getService(Components.interfaces.nsIShellService); |
1330 if (!shellSvc) |
|
1331 return; |
1332 shellSvc.setDefaultBrowser(true, false); |
1332 shellSvc.setDefaultBrowser(true, false); |
1333 + if (kde_session == 1) { |
1333 + if (kde_session == 1) { |
1334 + var shellObj = Components.classes["@mozilla.org/file/local;1"] |
1334 + var shellObj = Components.classes["@mozilla.org/file/local;1"] |
1335 + .createInstance(Components.interfaces.nsILocalFile); |
1335 + .createInstance(Components.interfaces.nsILocalFile); |
1336 + shellObj.initWithPath("/usr/bin/kwriteconfig"); |
1336 + shellObj.initWithPath("/usr/bin/kwriteconfig"); |