1160 |
1160 |
1161 #include "nsProfileMigrator.h" |
1161 #include "nsProfileMigrator.h" |
1162 #if !defined(XP_BEOS) |
1162 #if !defined(XP_BEOS) |
1163 #include "nsDogbertProfileMigrator.h" |
1163 #include "nsDogbertProfileMigrator.h" |
1164 #endif |
1164 #endif |
1165 @@ -85,17 +85,17 @@ using namespace mozilla::browser; |
1165 @@ -84,18 +84,16 @@ using namespace mozilla::browser; |
|
1166 |
1166 ///////////////////////////////////////////////////////////////////////////// |
1167 ///////////////////////////////////////////////////////////////////////////// |
1167 |
1168 |
1168 NS_GENERIC_FACTORY_CONSTRUCTOR(DirectoryProvider) |
1169 NS_GENERIC_FACTORY_CONSTRUCTOR(DirectoryProvider) |
1169 #if defined(XP_WIN) |
1170 #if defined(XP_WIN) |
1170 NS_GENERIC_FACTORY_CONSTRUCTOR(nsWindowsShellService) |
1171 NS_GENERIC_FACTORY_CONSTRUCTOR(nsWindowsShellService) |
1171 #elif defined(XP_MACOSX) |
1172 #elif defined(XP_MACOSX) |
1172 NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacShellService) |
1173 NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacShellService) |
1173 #elif defined(MOZ_WIDGET_GTK2) |
1174 -#elif defined(MOZ_WIDGET_GTK2) |
1174 -NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init) |
1175 -NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init) |
1175 +NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsUnixShellService, Init) |
|
1176 #endif |
1176 #endif |
1177 |
1177 |
1178 #ifndef WINCE |
1178 #ifndef WINCE |
1179 |
1179 |
1180 #if !defined(XP_BEOS) |
1180 #if !defined(XP_BEOS) |
1181 NS_GENERIC_FACTORY_CONSTRUCTOR(nsDogbertProfileMigrator) |
1181 NS_GENERIC_FACTORY_CONSTRUCTOR(nsDogbertProfileMigrator) |
1182 #endif |
1182 #endif |
1183 #if !defined(XP_OS2) |
1183 #if !defined(XP_OS2) |
1184 @@ -151,17 +151,17 @@ NS_DEFINE_NAMED_CID(NS_SEAMONKEYPROFILEM |
1184 @@ -151,17 +149,17 @@ NS_DEFINE_NAMED_CID(NS_SEAMONKEYPROFILEM |
1185 #endif /* WINCE */ |
1185 #endif /* WINCE */ |
1186 NS_DEFINE_NAMED_CID(NS_PRIVATE_BROWSING_SERVICE_WRAPPER_CID); |
1186 NS_DEFINE_NAMED_CID(NS_PRIVATE_BROWSING_SERVICE_WRAPPER_CID); |
1187 |
1187 |
1188 static const mozilla::Module::CIDEntry kBrowserCIDs[] = { |
1188 static const mozilla::Module::CIDEntry kBrowserCIDs[] = { |
1189 { &kNS_BROWSERDIRECTORYPROVIDER_CID, false, NULL, DirectoryProviderConstructor }, |
1189 { &kNS_BROWSERDIRECTORYPROVIDER_CID, false, NULL, DirectoryProviderConstructor }, |
1528 + |
1528 + |
1529 +#include "nsUnixShellService.h" |
1529 +#include "nsUnixShellService.h" |
1530 +#include "nsGNOMEShellService.h" |
1530 +#include "nsGNOMEShellService.h" |
1531 +#include "nsKDEShellService.h" |
1531 +#include "nsKDEShellService.h" |
1532 +#include "nsKDEUtils.h" |
1532 +#include "nsKDEUtils.h" |
1533 +#include "nsIGenericFactory.h" |
1533 +#include "mozilla/ModuleUtils.h" |
1534 + |
1534 + |
1535 +NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init) |
1535 +NS_GENERIC_FACTORY_CONSTRUCTOR(nsGNOMEShellService) |
1536 +NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsKDEShellService, Init) |
1536 +NS_GENERIC_FACTORY_CONSTRUCTOR(nsKDEShellService) |
1537 + |
1537 + |
1538 +NS_METHOD |
1538 +NS_METHOD |
1539 +nsUnixShellServiceConstructor(nsISupports *aOuter, REFNSIID aIID, void **aResult) |
1539 +nsUnixShellServiceConstructor(nsISupports *aOuter, REFNSIID aIID, void **aResult) |
1540 +{ |
1540 +{ |
1541 + if( nsKDEUtils::kdeSupport()) |
1541 + if( nsKDEUtils::kdeSupport()) |