From adfb2f038dd743a731e7ee846d6a73c541c47023 Mon Sep 17 00:00:00 2001 From: "bryner%brianryner.com" Date: Tue, 14 Sep 2004 20:43:45 +0000 Subject: [PATCH] Bug 245653 - don't try to use dogbert migrator on BeOS. Patch by thesuckiestemail@yahoo.se, r=sergei_d@fi.tartu.ee. git-svn-id: svn://10.0.0.236/trunk@162329 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/browser/components/build/nsModule.cpp | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/mozilla/browser/components/build/nsModule.cpp b/mozilla/browser/components/build/nsModule.cpp index 052fb52191e..629d131aba4 100644 --- a/mozilla/browser/components/build/nsModule.cpp +++ b/mozilla/browser/components/build/nsModule.cpp @@ -48,7 +48,9 @@ #include "nsGNOMEShellService.h" #endif #include "nsProfileMigrator.h" +#if !defined(XP_BEOS) #include "nsDogbertProfileMigrator.h" +#endif #if !defined(XP_OS2) #include "nsOperaProfileMigrator.h" #endif @@ -74,8 +76,9 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacShellService) #elif defined(MOZ_WIDGET_GTK2) NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init) #endif - +#if !defined(XP_BEOS) NS_GENERIC_FACTORY_CONSTRUCTOR(nsDogbertProfileMigrator) +#endif #if !defined(XP_OS2) NS_GENERIC_FACTORY_CONSTRUCTOR(nsOperaProfileMigrator) #endif @@ -164,6 +167,13 @@ static const nsModuleComponentInfo components[] = nsOperaProfileMigratorConstructor }, #endif +#if !defined(XP_BEOS) + { "Netscape 4.x Profile Migrator", + NS_DOGBERTPROFILEMIGRATOR_CID, + NS_BROWSERPROFILEMIGRATOR_CONTRACTID_PREFIX "dogbert", + nsDogbertProfileMigratorConstructor }, +#endif + { "Phoenix Profile Migrator", NS_PHOENIXPROFILEMIGRATOR_CID, NS_BROWSERPROFILEMIGRATOR_CONTRACTID_PREFIX "phoenix", @@ -172,12 +182,8 @@ static const nsModuleComponentInfo components[] = { "Seamonkey Profile Migrator", NS_SEAMONKEYPROFILEMIGRATOR_CID, NS_BROWSERPROFILEMIGRATOR_CONTRACTID_PREFIX "seamonkey", - nsSeamonkeyProfileMigratorConstructor }, + nsSeamonkeyProfileMigratorConstructor } - { "Netscape 4.x Profile Migrator", - NS_DOGBERTPROFILEMIGRATOR_CID, - NS_BROWSERPROFILEMIGRATOR_CONTRACTID_PREFIX "dogbert", - nsDogbertProfileMigratorConstructor } };