1156 -#include "nsGNOMEShellService.h" |
1156 -#include "nsGNOMEShellService.h" |
1157 +#include "nsUnixShellService.h" |
1157 +#include "nsUnixShellService.h" |
1158 #endif |
1158 #endif |
1159 |
1159 |
1160 #if defined(XP_WIN) && !defined(__MINGW32__) |
1160 #if defined(XP_WIN) && !defined(__MINGW32__) |
1161 #include "nsIEProfileMigrator.h" |
1161 #include "nsIEHistoryEnumerator.h" |
1162 #elif defined(XP_MACOSX) |
|
1163 #include "nsSafariProfileMigrator.h" |
|
1164 #endif |
1162 #endif |
1165 |
1163 |
1166 @@ -67,18 +67,16 @@ using namespace mozilla::browser; |
1164 #include "rdf.h" |
|
1165 #include "nsFeedSniffer.h" |
|
1166 @@ -65,18 +65,16 @@ using namespace mozilla::browser; |
1167 |
1167 |
1168 ///////////////////////////////////////////////////////////////////////////// |
1168 ///////////////////////////////////////////////////////////////////////////// |
1169 |
1169 |
1170 NS_GENERIC_FACTORY_CONSTRUCTOR(DirectoryProvider) |
1170 NS_GENERIC_FACTORY_CONSTRUCTOR(DirectoryProvider) |
1171 #if defined(XP_WIN) |
1171 #if defined(XP_WIN) |
1175 -#elif defined(MOZ_WIDGET_GTK2) |
1175 -#elif defined(MOZ_WIDGET_GTK2) |
1176 -NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init) |
1176 -NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init) |
1177 #endif |
1177 #endif |
1178 |
1178 |
1179 #if defined(XP_WIN) && !defined(__MINGW32__) |
1179 #if defined(XP_WIN) && !defined(__MINGW32__) |
1180 NS_GENERIC_FACTORY_CONSTRUCTOR(nsIEProfileMigrator) |
1180 NS_GENERIC_FACTORY_CONSTRUCTOR(nsIEHistoryEnumerator) |
1181 #elif defined(XP_MACOSX) |
|
1182 NS_GENERIC_FACTORY_CONSTRUCTOR(nsSafariProfileMigrator) |
|
1183 #endif |
1181 #endif |
1184 |
1182 |
1185 @@ -102,17 +100,17 @@ NS_DEFINE_NAMED_CID(NS_SAFARIPROFILEMIGR |
1183 NS_GENERIC_FACTORY_CONSTRUCTOR(nsFeedSniffer) |
|
1184 |
|
1185 @@ -97,17 +95,17 @@ NS_DEFINE_NAMED_CID(NS_SHELLSERVICE_CID) |
1186 #endif |
1186 #endif |
1187 NS_DEFINE_NAMED_CID(NS_PRIVATE_BROWSING_SERVICE_WRAPPER_CID); |
1187 NS_DEFINE_NAMED_CID(NS_PRIVATE_BROWSING_SERVICE_WRAPPER_CID); |
1188 |
1188 |
1189 static const mozilla::Module::CIDEntry kBrowserCIDs[] = { |
1189 static const mozilla::Module::CIDEntry kBrowserCIDs[] = { |
1190 { &kNS_BROWSERDIRECTORYPROVIDER_CID, false, NULL, DirectoryProviderConstructor }, |
1190 { &kNS_BROWSERDIRECTORYPROVIDER_CID, false, NULL, DirectoryProviderConstructor }, |
1195 + { &kNS_SHELLSERVICE_CID, false, NULL, nsUnixShellServiceConstructor }, |
1195 + { &kNS_SHELLSERVICE_CID, false, NULL, nsUnixShellServiceConstructor }, |
1196 #endif |
1196 #endif |
1197 { &kNS_FEEDSNIFFER_CID, false, NULL, nsFeedSnifferConstructor }, |
1197 { &kNS_FEEDSNIFFER_CID, false, NULL, nsFeedSnifferConstructor }, |
1198 { &kNS_BROWSER_ABOUT_REDIRECTOR_CID, false, NULL, AboutRedirector::Create }, |
1198 { &kNS_BROWSER_ABOUT_REDIRECTOR_CID, false, NULL, AboutRedirector::Create }, |
1199 #if defined(XP_WIN) && !defined(__MINGW32__) |
1199 #if defined(XP_WIN) && !defined(__MINGW32__) |
1200 { &kNS_WINIEPROFILEMIGRATOR_CID, false, NULL, nsIEProfileMigratorConstructor }, |
1200 { &kNS_WINIEHISTORYENUMERATOR_CID, false, NULL, nsIEHistoryEnumeratorConstructor }, |
1201 #elif defined(XP_MACOSX) |
1201 #elif defined(XP_MACOSX) |
1202 { &kNS_SHELLSERVICE_CID, false, NULL, nsMacShellServiceConstructor }, |
1202 { &kNS_SHELLSERVICE_CID, false, NULL, nsMacShellServiceConstructor }, |
1203 { &kNS_SAFARIPROFILEMIGRATOR_CID, false, NULL, nsSafariProfileMigratorConstructor }, |
1203 #endif |
1204 diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js |
1204 diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js |
1205 --- a/browser/components/preferences/advanced.js |
1205 --- a/browser/components/preferences/advanced.js |
1206 +++ b/browser/components/preferences/advanced.js |
1206 +++ b/browser/components/preferences/advanced.js |
1207 @@ -716,24 +716,42 @@ var gAdvancedPane = { |
1207 @@ -716,24 +716,42 @@ var gAdvancedPane = { |
1208 var brandBundle = document.getElementById("bundleBrand"); |
1208 var brandBundle = document.getElementById("bundleBrand"); |
1712 + |
1712 + |
1713 +#endif // nsunixshellservice_h____ |
1713 +#endif // nsunixshellservice_h____ |
1714 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1714 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1715 --- a/browser/installer/package-manifest.in |
1715 --- a/browser/installer/package-manifest.in |
1716 +++ b/browser/installer/package-manifest.in |
1716 +++ b/browser/installer/package-manifest.in |
1717 @@ -467,16 +467,17 @@ |
1717 @@ -495,16 +495,17 @@ |
1718 #endif |
1718 #endif |
1719 #endif |
1719 #endif |
1720 |
1720 |
1721 ; [Default Preferences] |
1721 ; [Default Preferences] |
1722 ; All the pref files must be part of base to prevent migration bugs |
1722 ; All the pref files must be part of base to prevent migration bugs |