1268 + |
1268 + |
1269 +</window> |
1269 +</window> |
1270 diff --git a/browser/base/jar.mn b/browser/base/jar.mn |
1270 diff --git a/browser/base/jar.mn b/browser/base/jar.mn |
1271 --- a/browser/base/jar.mn |
1271 --- a/browser/base/jar.mn |
1272 +++ b/browser/base/jar.mn |
1272 +++ b/browser/base/jar.mn |
1273 @@ -35,16 +35,18 @@ browser.jar: |
1273 @@ -50,16 +50,18 @@ browser.jar: |
1274 content/browser/abouthome/restore-large.png (content/abouthome/restore-large.png) |
1274 content/browser/abouthome/mozilla@2x.png (content/abouthome/mozilla@2x.png) |
1275 content/browser/abouthome/mozilla.png (content/abouthome/mozilla.png) |
1275 #endif |
1276 content/browser/abouthome/noise.png (content/abouthome/noise.png) |
|
1277 content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png) |
1276 content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png) |
1278 content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png) |
1277 content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png) |
|
1278 content/browser/aboutSocialError.xhtml (content/aboutSocialError.xhtml) |
1279 * content/browser/browser.css (content/browser.css) |
1279 * content/browser/browser.css (content/browser.css) |
1280 * content/browser/browser.js (content/browser.js) |
1280 * content/browser/browser.js (content/browser.js) |
1281 * content/browser/browser.xul (content/browser.xul) |
1281 * content/browser/browser.xul (content/browser.xul) |
1282 +* content/browser/browser-kde.xul (content/browser-kde.xul) |
1282 +* content/browser/browser-kde.xul (content/browser-kde.xul) |
1283 +% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde |
1283 +% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde |
1284 * content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml) |
1284 * content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml) |
1285 content/browser/content.js (content/content.js) |
1285 content/browser/content.js (content/content.js) |
1286 content/browser/newtab/newTab.xul (content/newtab/newTab.xul) |
1286 content/browser/newtab/newTab.xul (content/newtab/newTab.xul) |
1287 * content/browser/newtab/newTab.js (content/newtab/newTab.js) |
1287 * content/browser/newtab/newTab.js (content/newtab/newTab.js) |
1288 content/browser/newtab/newTab.css (content/newtab/newTab.css) |
1288 content/browser/newtab/newTab.css (content/newtab/newTab.css) |
|
1289 content/browser/newtab/preload.xhtml (content/newtab/preload.xhtml) |
1289 * content/browser/pageinfo/pageInfo.xul (content/pageinfo/pageInfo.xul) |
1290 * content/browser/pageinfo/pageInfo.xul (content/pageinfo/pageInfo.xul) |
1290 * content/browser/pageinfo/pageInfo.js (content/pageinfo/pageInfo.js) |
1291 * content/browser/pageinfo/pageInfo.js (content/pageinfo/pageInfo.js) |
1291 content/browser/pageinfo/pageInfo.css (content/pageinfo/pageInfo.css) |
|
1292 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp |
1292 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp |
1293 --- a/browser/components/build/nsModule.cpp |
1293 --- a/browser/components/build/nsModule.cpp |
1294 +++ b/browser/components/build/nsModule.cpp |
1294 +++ b/browser/components/build/nsModule.cpp |
1295 @@ -8,17 +8,17 @@ |
1295 @@ -8,17 +8,17 @@ |
1296 #include "nsBrowserCompsCID.h" |
1296 #include "nsBrowserCompsCID.h" |
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 #ifdef XP_WIN |
1372 #ifdef XP_WIN |
1373 let shellSvc = getShellService(); |
|
1374 // In Windows 8 we launch the control panel since it's the only |
1373 // In Windows 8 we launch the control panel since it's the only |
1375 // way to get all file type association prefs. So we don't know |
1374 // way to get all file type association prefs. So we don't know |
1376 // when the user will select the default. We refresh here periodically |
1375 // when the user will select the default. We refresh here periodically |
1377 // in case the default changes. |
1376 // in case the default changes. On other Windows OS's defaults can also |
1378 @@ -737,14 +743,25 @@ var gAdvancedPane = { |
1377 // be set while the prefs are open. |
|
1378 @@ -715,14 +721,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(); |
1835 + |
1835 + |
1836 +#endif // nsunixshellservice_h____ |
1836 +#endif // nsunixshellservice_h____ |
1837 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1837 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1838 --- a/browser/installer/package-manifest.in |
1838 --- a/browser/installer/package-manifest.in |
1839 +++ b/browser/installer/package-manifest.in |
1839 +++ b/browser/installer/package-manifest.in |
1840 @@ -559,18 +559,20 @@ |
1840 @@ -572,18 +572,20 @@ |
1841 @BINPATH@/@PREF_DIR@/services-sync.js |
1841 @BINPATH@/@PREF_DIR@/services-sync.js |
1842 #endif |
1842 #endif |
1843 @BINPATH@/greprefs.js |
1843 @BINPATH@/greprefs.js |
1844 @BINPATH@/defaults/autoconfig/platform.js |
1844 @BINPATH@/defaults/autoconfig/platform.js |
1845 @BINPATH@/defaults/autoconfig/prefcalls.js |
1845 @BINPATH@/defaults/autoconfig/prefcalls.js |