equal
deleted
inserted
replaced
1367 + if (env.get('KDE_FULL_SESSION') == "true") |
1367 + if (env.get('KDE_FULL_SESSION') == "true") |
1368 + kde_session = 1; |
1368 + kde_session = 1; |
1369 + |
1369 + |
1370 #ifdef HAVE_SHELL_SERVICE |
1370 #ifdef HAVE_SHELL_SERVICE |
1371 this.updateSetDefaultBrowser(); |
1371 this.updateSetDefaultBrowser(); |
1372 #endif |
1372 #ifdef XP_WIN |
1373 #ifdef MOZ_UPDATER |
1373 let shellSvc = getShellService(); |
1374 this.updateReadPrefs(); |
1374 // In Windows 8 we launch the control panel since it's the only |
1375 #endif |
1375 // way to get all file type association prefs. So we don't know |
1376 this.updateOfflineApps(); |
1376 // when the user will select the default. We refresh here periodically |
1377 #ifdef MOZ_CRASHREPORTER |
1377 // in case the default changes. |
1378 @@ -715,12 +721,23 @@ var gAdvancedPane = { |
1378 @@ -737,14 +743,25 @@ var gAdvancedPane = { |
1379 * Set browser as the operating system default browser. |
1379 * Set browser as the operating system default browser. |
1380 */ |
1380 */ |
1381 setDefaultBrowser: function() |
1381 setDefaultBrowser: function() |
1382 { |
1382 { |
1383 let shellSvc = getShellService(); |
1383 let shellSvc = getShellService(); |
1393 + process.init(shellObj); |
1393 + process.init(shellObj); |
1394 + var args = ["--file", "kdeglobals", "--group", "General", "--key", |
1394 + var args = ["--file", "kdeglobals", "--group", "General", "--key", |
1395 + "BrowserApplication", "MozillaFirefox"]; |
1395 + "BrowserApplication", "MozillaFirefox"]; |
1396 + process.run(false, args, args.length); |
1396 + process.run(false, args, args.length); |
1397 + } |
1397 + } |
1398 document.getElementById("setDefaultPane").selectedIndex = 1; |
1398 let selectedIndex = |
|
1399 shellSvc.isDefaultBrowser(false, true) ? 1 : 0; |
|
1400 document.getElementById("setDefaultPane").selectedIndex = selectedIndex; |
1399 } |
1401 } |
1400 #endif |
1402 #endif |
1401 }; |
1403 }; |
1402 diff --git a/browser/components/shell/src/Makefile.in b/browser/components/shell/src/Makefile.in |
1404 diff --git a/browser/components/shell/src/Makefile.in b/browser/components/shell/src/Makefile.in |
1403 --- a/browser/components/shell/src/Makefile.in |
1405 --- a/browser/components/shell/src/Makefile.in |