1212 * content/browser/browser.js (content/browser.js) |
1212 * content/browser/browser.js (content/browser.js) |
1213 * content/browser/browser.xul (content/browser.xul) |
1213 * content/browser/browser.xul (content/browser.xul) |
1214 +* content/browser/browser-kde.xul (content/browser-kde.xul) |
1214 +* content/browser/browser-kde.xul (content/browser-kde.xul) |
1215 +% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde |
1215 +% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde |
1216 * content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml) |
1216 * content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml) |
|
1217 * content/browser/chatWindow.xul (content/chatWindow.xul) |
1217 content/browser/content.js (content/content.js) |
1218 content/browser/content.js (content/content.js) |
1218 content/browser/newtab/newTab.xul (content/newtab/newTab.xul) |
1219 content/browser/newtab/newTab.xul (content/newtab/newTab.xul) |
1219 * content/browser/newtab/newTab.js (content/newtab/newTab.js) |
1220 * content/browser/newtab/newTab.js (content/newtab/newTab.js) |
1220 content/browser/newtab/newTab.css (content/newtab/newTab.css) |
1221 content/browser/newtab/newTab.css (content/newtab/newTab.css) |
1221 content/browser/newtab/preload.xhtml (content/newtab/preload.xhtml) |
|
1222 * content/browser/pageinfo/pageInfo.xul (content/pageinfo/pageInfo.xul) |
1222 * content/browser/pageinfo/pageInfo.xul (content/pageinfo/pageInfo.xul) |
1223 content/browser/pageinfo/pageInfo.js (content/pageinfo/pageInfo.js) |
1223 content/browser/pageinfo/pageInfo.js (content/pageinfo/pageInfo.js) |
1224 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp |
1224 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp |
1225 --- a/browser/components/build/nsModule.cpp |
1225 --- a/browser/components/build/nsModule.cpp |
1226 +++ b/browser/components/build/nsModule.cpp |
1226 +++ b/browser/components/build/nsModule.cpp |
1230 |
1230 |
1231 #if defined(XP_WIN) |
1231 #if defined(XP_WIN) |
1232 #include "nsWindowsShellService.h" |
1232 #include "nsWindowsShellService.h" |
1233 #elif defined(XP_MACOSX) |
1233 #elif defined(XP_MACOSX) |
1234 #include "nsMacShellService.h" |
1234 #include "nsMacShellService.h" |
1235 #elif defined(MOZ_WIDGET_GTK2) |
1235 #elif defined(MOZ_WIDGET_GTK) |
1236 -#include "nsGNOMEShellService.h" |
1236 -#include "nsGNOMEShellService.h" |
1237 +#include "nsUnixShellService.h" |
1237 +#include "nsUnixShellService.h" |
1238 #endif |
1238 #endif |
1239 |
1239 |
1240 #if defined(XP_WIN) |
1240 #if defined(XP_WIN) |
1250 NS_GENERIC_FACTORY_CONSTRUCTOR(DirectoryProvider) |
1250 NS_GENERIC_FACTORY_CONSTRUCTOR(DirectoryProvider) |
1251 #if defined(XP_WIN) |
1251 #if defined(XP_WIN) |
1252 NS_GENERIC_FACTORY_CONSTRUCTOR(nsWindowsShellService) |
1252 NS_GENERIC_FACTORY_CONSTRUCTOR(nsWindowsShellService) |
1253 #elif defined(XP_MACOSX) |
1253 #elif defined(XP_MACOSX) |
1254 NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacShellService) |
1254 NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacShellService) |
1255 -#elif defined(MOZ_WIDGET_GTK2) |
1255 -#elif defined(MOZ_WIDGET_GTK) |
1256 -NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init) |
1256 -NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init) |
1257 #endif |
1257 #endif |
1258 |
1258 |
1259 #if defined(XP_WIN) |
1259 #if defined(XP_WIN) |
1260 NS_GENERIC_FACTORY_CONSTRUCTOR(nsIEHistoryEnumerator) |
1260 NS_GENERIC_FACTORY_CONSTRUCTOR(nsIEHistoryEnumerator) |
1268 |
1268 |
1269 static const mozilla::Module::CIDEntry kBrowserCIDs[] = { |
1269 static const mozilla::Module::CIDEntry kBrowserCIDs[] = { |
1270 { &kNS_BROWSERDIRECTORYPROVIDER_CID, false, NULL, DirectoryProviderConstructor }, |
1270 { &kNS_BROWSERDIRECTORYPROVIDER_CID, false, NULL, DirectoryProviderConstructor }, |
1271 #if defined(XP_WIN) |
1271 #if defined(XP_WIN) |
1272 { &kNS_SHELLSERVICE_CID, false, NULL, nsWindowsShellServiceConstructor }, |
1272 { &kNS_SHELLSERVICE_CID, false, NULL, nsWindowsShellServiceConstructor }, |
1273 #elif defined(MOZ_WIDGET_GTK2) |
1273 #elif defined(MOZ_WIDGET_GTK) |
1274 - { &kNS_SHELLSERVICE_CID, false, NULL, nsGNOMEShellServiceConstructor }, |
1274 - { &kNS_SHELLSERVICE_CID, false, NULL, nsGNOMEShellServiceConstructor }, |
1275 + { &kNS_SHELLSERVICE_CID, false, NULL, nsUnixShellServiceConstructor }, |
1275 + { &kNS_SHELLSERVICE_CID, false, NULL, nsUnixShellServiceConstructor }, |
1276 #endif |
1276 #endif |
1277 { &kNS_FEEDSNIFFER_CID, false, NULL, nsFeedSnifferConstructor }, |
1277 { &kNS_FEEDSNIFFER_CID, false, NULL, nsFeedSnifferConstructor }, |
1278 { &kNS_BROWSER_ABOUT_REDIRECTOR_CID, false, NULL, AboutRedirector::Create }, |
1278 { &kNS_BROWSER_ABOUT_REDIRECTOR_CID, false, NULL, AboutRedirector::Create }, |
1305 // In Windows 8 we launch the control panel since it's the only |
1305 // In Windows 8 we launch the control panel since it's the only |
1306 // way to get all file type association prefs. So we don't know |
1306 // way to get all file type association prefs. So we don't know |
1307 // when the user will select the default. We refresh here periodically |
1307 // when the user will select the default. We refresh here periodically |
1308 // in case the default changes. On other Windows OS's defaults can also |
1308 // in case the default changes. On other Windows OS's defaults can also |
1309 // be set while the prefs are open. |
1309 // be set while the prefs are open. |
1310 @@ -797,14 +803,25 @@ var gAdvancedPane = { |
1310 @@ -857,14 +863,25 @@ var gAdvancedPane = { |
1311 * Set browser as the operating system default browser. |
1311 * Set browser as the operating system default browser. |
1312 */ |
1312 */ |
1313 setDefaultBrowser: function() |
1313 setDefaultBrowser: function() |
1314 { |
1314 { |
1315 let shellSvc = getShellService(); |
1315 let shellSvc = getShellService(); |
1334 #endif |
1334 #endif |
1335 }; |
1335 }; |
1336 diff --git a/browser/components/shell/src/Makefile.in b/browser/components/shell/src/Makefile.in |
1336 diff --git a/browser/components/shell/src/Makefile.in b/browser/components/shell/src/Makefile.in |
1337 --- a/browser/components/shell/src/Makefile.in |
1337 --- a/browser/components/shell/src/Makefile.in |
1338 +++ b/browser/components/shell/src/Makefile.in |
1338 +++ b/browser/components/shell/src/Makefile.in |
1339 @@ -15,17 +15,18 @@ USE_STATIC_LIBS = 1 |
1339 @@ -17,10 +17,12 @@ DISABLED_EXTRA_COMPONENTS = nsSetDefault |
1340 |
1340 |
1341 ifeq ($(OS_ARCH),WINNT) |
1341 include $(topsrcdir)/config/rules.mk |
1342 CPPSRCS = nsWindowsShellService.cpp |
1342 |
1343 else |
1343 DEFINES += -DMOZ_APP_NAME=\"$(MOZ_APP_NAME)\" \ |
1344 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) |
1344 -DMOZ_APP_VERSION=\"$(MOZ_APP_VERSION)\" |
1345 CPPSRCS = nsMacShellService.cpp |
1345 |
1346 else |
1346 CXXFLAGS += $(TK_CFLAGS) |
1347 ifeq ($(MOZ_WIDGET_TOOLKIT), gtk2) |
1347 |
1348 -CPPSRCS = nsGNOMEShellService.cpp |
|
1349 +CPPSRCS = nsUnixShellService.cpp nsGNOMEShellService.cpp nsKDEShellService.cpp |
|
1350 +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre |
1348 +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre |
1351 endif |
1349 + |
1352 endif |
1350 clobber:: |
1353 endif |
1351 rm -f $(DIST)/lib/$(LIBRARY_NAME).lib |
|
1352 diff --git a/browser/components/shell/src/moz.build b/browser/components/shell/src/moz.build |
|
1353 --- a/browser/components/shell/src/moz.build |
|
1354 +++ b/browser/components/shell/src/moz.build |
|
1355 @@ -11,17 +11,19 @@ if CONFIG['OS_ARCH'] == 'WINNT': |
|
1356 'nsWindowsShellService.cpp', |
|
1357 ] |
|
1358 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': |
|
1359 CPP_SOURCES += [ |
|
1360 'nsMacShellService.cpp', |
|
1361 ] |
|
1362 elif CONFIG['MOZ_WIDGET_GTK']: |
|
1363 CPP_SOURCES += [ |
|
1364 + 'nsUnixShellService.cpp', |
|
1365 'nsGNOMEShellService.cpp', |
|
1366 + 'nsKDEShellService.cpp' |
|
1367 ] |
1354 |
1368 |
1355 ifdef CPPSRCS |
1369 if CPP_SOURCES: |
1356 LIBRARY_NAME = shellservice_s |
1370 LIBRARY_NAME = 'shellservice_s' |
1357 endif |
|
1358 |
1371 |
|
1372 EXTRA_COMPONENTS += [ |
|
1373 'nsSetDefaultBrowser.js', |
|
1374 'nsSetDefaultBrowser.manifest', |
1359 diff --git a/browser/components/shell/src/nsKDEShellService.cpp b/browser/components/shell/src/nsKDEShellService.cpp |
1375 diff --git a/browser/components/shell/src/nsKDEShellService.cpp b/browser/components/shell/src/nsKDEShellService.cpp |
1360 new file mode 100644 |
1376 new file mode 100644 |
1361 --- /dev/null |
1377 --- /dev/null |
1362 +++ b/browser/components/shell/src/nsKDEShellService.cpp |
1378 +++ b/browser/components/shell/src/nsKDEShellService.cpp |
1363 @@ -0,0 +1,234 @@ |
1379 @@ -0,0 +1,234 @@ |
1767 + |
1783 + |
1768 +#endif // nsunixshellservice_h____ |
1784 +#endif // nsunixshellservice_h____ |
1769 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1785 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1770 --- a/browser/installer/package-manifest.in |
1786 --- a/browser/installer/package-manifest.in |
1771 +++ b/browser/installer/package-manifest.in |
1787 +++ b/browser/installer/package-manifest.in |
1772 @@ -604,19 +604,21 @@ |
1788 @@ -601,19 +601,21 @@ |
1773 @BINPATH@/defaults/autoconfig/prefcalls.js |
1789 @BINPATH@/defaults/autoconfig/prefcalls.js |
1774 @BINPATH@/browser/defaults/profile/prefs.js |
1790 @BINPATH@/browser/defaults/profile/prefs.js |
1775 |
1791 |
1776 #ifndef LIBXUL_SDK |
1792 #ifndef LIBXUL_SDK |
1777 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) |
1793 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) |