1103 + |
1103 + |
1104 +</window> |
1104 +</window> |
1105 diff --git a/browser/base/jar.mn b/browser/base/jar.mn |
1105 diff --git a/browser/base/jar.mn b/browser/base/jar.mn |
1106 --- a/browser/base/jar.mn |
1106 --- a/browser/base/jar.mn |
1107 +++ b/browser/base/jar.mn |
1107 +++ b/browser/base/jar.mn |
1108 @@ -22,16 +22,18 @@ browser.jar: |
1108 @@ -21,16 +21,18 @@ browser.jar: |
1109 * content/browser/aboutHome.css (content/aboutHome.css) |
1109 * content/browser/aboutHome.css (content/aboutHome.css) |
1110 content/browser/aboutHome-restore-icon.png (content/aboutHome-restore-icon.png) |
1110 content/browser/aboutHome-restore-icon.png (content/aboutHome-restore-icon.png) |
1111 content/browser/aboutHome-restore-icon-small.png (content/aboutHome-restore-icon-small.png) |
1111 content/browser/aboutHome-restore-icon-small.png (content/aboutHome-restore-icon-small.png) |
1112 content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png) |
1112 content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png) |
1113 content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png) |
1113 content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png) |
1117 +* content/browser/browser-kde.xul (content/browser-kde.xul) |
1117 +* content/browser/browser-kde.xul (content/browser-kde.xul) |
1118 +% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde |
1118 +% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde |
1119 * content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml) |
1119 * content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml) |
1120 * content/browser/fullscreen-video.xhtml (content/fullscreen-video.xhtml) |
1120 * content/browser/fullscreen-video.xhtml (content/fullscreen-video.xhtml) |
1121 * content/browser/inspector.html (content/inspector.html) |
1121 * content/browser/inspector.html (content/inspector.html) |
|
1122 * content/browser/scratchpad.xul (content/scratchpad.xul) |
|
1123 * content/browser/scratchpad.js (content/scratchpad.js) |
1122 * content/browser/pageinfo/pageInfo.xul (content/pageinfo/pageInfo.xul) |
1124 * content/browser/pageinfo/pageInfo.xul (content/pageinfo/pageInfo.xul) |
1123 * content/browser/pageinfo/pageInfo.js (content/pageinfo/pageInfo.js) |
1125 * content/browser/pageinfo/pageInfo.js (content/pageinfo/pageInfo.js) |
1124 * content/browser/pageinfo/pageInfo.css (content/pageinfo/pageInfo.css) |
1126 * content/browser/pageinfo/pageInfo.css (content/pageinfo/pageInfo.css) |
1125 * content/browser/pageinfo/pageInfo.xml (content/pageinfo/pageInfo.xml) |
|
1126 * content/browser/pageinfo/feeds.js (content/pageinfo/feeds.js) |
|
1127 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp |
1127 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp |
1128 --- a/browser/components/build/nsModule.cpp |
1128 --- a/browser/components/build/nsModule.cpp |
1129 +++ b/browser/components/build/nsModule.cpp |
1129 +++ b/browser/components/build/nsModule.cpp |
1130 @@ -41,17 +41,17 @@ |
1130 @@ -41,17 +41,17 @@ |
1131 #include "nsBrowserCompsCID.h" |
1131 #include "nsBrowserCompsCID.h" |
1138 #elif defined(MOZ_WIDGET_GTK2) |
1138 #elif defined(MOZ_WIDGET_GTK2) |
1139 -#include "nsGNOMEShellService.h" |
1139 -#include "nsGNOMEShellService.h" |
1140 +#include "nsUnixShellService.h" |
1140 +#include "nsUnixShellService.h" |
1141 #endif |
1141 #endif |
1142 |
1142 |
1143 #ifndef WINCE |
|
1144 |
|
1145 #include "nsProfileMigrator.h" |
1143 #include "nsProfileMigrator.h" |
1146 #include "nsDogbertProfileMigrator.h" |
|
1147 #if !defined(XP_OS2) |
1144 #if !defined(XP_OS2) |
1148 #include "nsOperaProfileMigrator.h" |
1145 #include "nsOperaProfileMigrator.h" |
1149 @@ -82,18 +82,16 @@ using namespace mozilla::browser; |
1146 #endif |
|
1147 #include "nsSeamonkeyProfileMigrator.h" |
|
1148 #if defined(XP_WIN) && !defined(__MINGW32__) |
|
1149 @@ -72,18 +72,16 @@ using namespace mozilla::browser; |
1150 |
1150 |
1151 ///////////////////////////////////////////////////////////////////////////// |
1151 ///////////////////////////////////////////////////////////////////////////// |
1152 |
1152 |
1153 NS_GENERIC_FACTORY_CONSTRUCTOR(DirectoryProvider) |
1153 NS_GENERIC_FACTORY_CONSTRUCTOR(DirectoryProvider) |
1154 #if defined(XP_WIN) |
1154 #if defined(XP_WIN) |
1157 NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacShellService) |
1157 NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacShellService) |
1158 -#elif defined(MOZ_WIDGET_GTK2) |
1158 -#elif defined(MOZ_WIDGET_GTK2) |
1159 -NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init) |
1159 -NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init) |
1160 #endif |
1160 #endif |
1161 |
1161 |
1162 #ifndef WINCE |
|
1163 |
|
1164 NS_GENERIC_FACTORY_CONSTRUCTOR(nsDogbertProfileMigrator) |
|
1165 #if !defined(XP_OS2) |
1162 #if !defined(XP_OS2) |
1166 NS_GENERIC_FACTORY_CONSTRUCTOR(nsOperaProfileMigrator) |
1163 NS_GENERIC_FACTORY_CONSTRUCTOR(nsOperaProfileMigrator) |
1167 #endif |
1164 #endif |
1168 @@ -145,17 +143,17 @@ NS_DEFINE_NAMED_CID(NS_SEAMONKEYPROFILEM |
1165 NS_GENERIC_FACTORY_CONSTRUCTOR(nsProfileMigrator) |
1169 #endif /* WINCE */ |
1166 NS_GENERIC_FACTORY_CONSTRUCTOR(nsSeamonkeyProfileMigrator) |
|
1167 #if defined(XP_WIN) && !defined(__MINGW32__) |
|
1168 @@ -117,17 +115,17 @@ NS_DEFINE_NAMED_CID(NS_OPERAPROFILEMIGRA |
|
1169 NS_DEFINE_NAMED_CID(NS_SEAMONKEYPROFILEMIGRATOR_CID); |
1170 NS_DEFINE_NAMED_CID(NS_PRIVATE_BROWSING_SERVICE_WRAPPER_CID); |
1170 NS_DEFINE_NAMED_CID(NS_PRIVATE_BROWSING_SERVICE_WRAPPER_CID); |
1171 |
1171 |
1172 static const mozilla::Module::CIDEntry kBrowserCIDs[] = { |
1172 static const mozilla::Module::CIDEntry kBrowserCIDs[] = { |
1173 { &kNS_BROWSERDIRECTORYPROVIDER_CID, false, NULL, DirectoryProviderConstructor }, |
1173 { &kNS_BROWSERDIRECTORYPROVIDER_CID, false, NULL, DirectoryProviderConstructor }, |
1174 #if defined(XP_WIN) |
1174 #if defined(XP_WIN) |
1177 - { &kNS_SHELLSERVICE_CID, false, NULL, nsGNOMEShellServiceConstructor }, |
1177 - { &kNS_SHELLSERVICE_CID, false, NULL, nsGNOMEShellServiceConstructor }, |
1178 + { &kNS_SHELLSERVICE_CID, false, NULL, nsUnixShellServiceConstructor }, |
1178 + { &kNS_SHELLSERVICE_CID, false, NULL, nsUnixShellServiceConstructor }, |
1179 #endif |
1179 #endif |
1180 { &kNS_FEEDSNIFFER_CID, false, NULL, nsFeedSnifferConstructor }, |
1180 { &kNS_FEEDSNIFFER_CID, false, NULL, nsFeedSnifferConstructor }, |
1181 { &kNS_BROWSER_ABOUT_REDIRECTOR_CID, false, NULL, AboutRedirector::Create }, |
1181 { &kNS_BROWSER_ABOUT_REDIRECTOR_CID, false, NULL, AboutRedirector::Create }, |
1182 #ifndef WINCE |
|
1183 { &kNS_FIREFOX_PROFILEMIGRATOR_CID, false, NULL, nsProfileMigratorConstructor }, |
1182 { &kNS_FIREFOX_PROFILEMIGRATOR_CID, false, NULL, nsProfileMigratorConstructor }, |
1184 #if defined(XP_WIN) && !defined(__MINGW32__) |
1183 #if defined(XP_WIN) && !defined(__MINGW32__) |
1185 { &kNS_WINIEPROFILEMIGRATOR_CID, false, NULL, nsIEProfileMigratorConstructor }, |
1184 { &kNS_WINIEPROFILEMIGRATOR_CID, false, NULL, nsIEProfileMigratorConstructor }, |
1186 #elif defined(XP_MACOSX) |
1185 #elif defined(XP_MACOSX) |
|
1186 { &kNS_SHELLSERVICE_CID, false, NULL, nsMacShellServiceConstructor }, |
1187 diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js |
1187 diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js |
1188 --- a/browser/components/preferences/advanced.js |
1188 --- a/browser/components/preferences/advanced.js |
1189 +++ b/browser/components/preferences/advanced.js |
1189 +++ b/browser/components/preferences/advanced.js |
1190 @@ -683,24 +683,42 @@ var gAdvancedPane = { |
1190 @@ -683,24 +683,42 @@ var gAdvancedPane = { |
1191 var brandBundle = document.getElementById("bundleBrand"); |
1191 var brandBundle = document.getElementById("bundleBrand"); |
1234 diff --git a/browser/components/shell/src/Makefile.in b/browser/components/shell/src/Makefile.in |
1234 diff --git a/browser/components/shell/src/Makefile.in b/browser/components/shell/src/Makefile.in |
1235 --- a/browser/components/shell/src/Makefile.in |
1235 --- a/browser/components/shell/src/Makefile.in |
1236 +++ b/browser/components/shell/src/Makefile.in |
1236 +++ b/browser/components/shell/src/Makefile.in |
1237 @@ -52,17 +52,18 @@ endif |
1237 @@ -52,17 +52,18 @@ endif |
1238 |
1238 |
1239 ifneq (,$(filter WINCE WINNT,$(OS_ARCH))) |
1239 ifeq ($(OS_ARCH),WINNT) |
1240 CPPSRCS = nsWindowsShellService.cpp |
1240 CPPSRCS = nsWindowsShellService.cpp |
1241 else |
1241 else |
1242 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) |
1242 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) |
1243 CPPSRCS = nsMacShellService.cpp |
1243 CPPSRCS = nsMacShellService.cpp |
1244 else |
1244 else |
1624 + |
1624 + |
1625 +#endif // nsunixshellservice_h____ |
1625 +#endif // nsunixshellservice_h____ |
1626 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1626 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1627 --- a/browser/installer/package-manifest.in |
1627 --- a/browser/installer/package-manifest.in |
1628 +++ b/browser/installer/package-manifest.in |
1628 +++ b/browser/installer/package-manifest.in |
1629 @@ -442,16 +442,17 @@ |
1629 @@ -435,16 +435,17 @@ |
1630 #endif |
1630 #endif |
1631 #endif |
1631 #endif |
1632 |
1632 |
1633 ; [Default Preferences] |
1633 ; [Default Preferences] |
1634 ; All the pref files must be part of base to prevent migration bugs |
1634 ; All the pref files must be part of base to prevent migration bugs |