Bug 245653 - don't try to use dogbert migrator on BeOS. Patch by thesuckiestemail@yahoo.se, r=sergei_d@fi.tartu.ee.
This commit is contained in:
@@ -48,7 +48,9 @@
|
|||||||
#include "nsGNOMEShellService.h"
|
#include "nsGNOMEShellService.h"
|
||||||
#endif
|
#endif
|
||||||
#include "nsProfileMigrator.h"
|
#include "nsProfileMigrator.h"
|
||||||
|
#if !defined(XP_BEOS)
|
||||||
#include "nsDogbertProfileMigrator.h"
|
#include "nsDogbertProfileMigrator.h"
|
||||||
|
#endif
|
||||||
#if !defined(XP_OS2)
|
#if !defined(XP_OS2)
|
||||||
#include "nsOperaProfileMigrator.h"
|
#include "nsOperaProfileMigrator.h"
|
||||||
#endif
|
#endif
|
||||||
@@ -74,8 +76,9 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacShellService)
|
|||||||
#elif defined(MOZ_WIDGET_GTK2)
|
#elif defined(MOZ_WIDGET_GTK2)
|
||||||
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init)
|
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init)
|
||||||
#endif
|
#endif
|
||||||
|
#if !defined(XP_BEOS)
|
||||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsDogbertProfileMigrator)
|
NS_GENERIC_FACTORY_CONSTRUCTOR(nsDogbertProfileMigrator)
|
||||||
|
#endif
|
||||||
#if !defined(XP_OS2)
|
#if !defined(XP_OS2)
|
||||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsOperaProfileMigrator)
|
NS_GENERIC_FACTORY_CONSTRUCTOR(nsOperaProfileMigrator)
|
||||||
#endif
|
#endif
|
||||||
@@ -164,6 +167,13 @@ static const nsModuleComponentInfo components[] =
|
|||||||
nsOperaProfileMigratorConstructor },
|
nsOperaProfileMigratorConstructor },
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if !defined(XP_BEOS)
|
||||||
|
{ "Netscape 4.x Profile Migrator",
|
||||||
|
NS_DOGBERTPROFILEMIGRATOR_CID,
|
||||||
|
NS_BROWSERPROFILEMIGRATOR_CONTRACTID_PREFIX "dogbert",
|
||||||
|
nsDogbertProfileMigratorConstructor },
|
||||||
|
#endif
|
||||||
|
|
||||||
{ "Phoenix Profile Migrator",
|
{ "Phoenix Profile Migrator",
|
||||||
NS_PHOENIXPROFILEMIGRATOR_CID,
|
NS_PHOENIXPROFILEMIGRATOR_CID,
|
||||||
NS_BROWSERPROFILEMIGRATOR_CONTRACTID_PREFIX "phoenix",
|
NS_BROWSERPROFILEMIGRATOR_CONTRACTID_PREFIX "phoenix",
|
||||||
@@ -172,12 +182,8 @@ static const nsModuleComponentInfo components[] =
|
|||||||
{ "Seamonkey Profile Migrator",
|
{ "Seamonkey Profile Migrator",
|
||||||
NS_SEAMONKEYPROFILEMIGRATOR_CID,
|
NS_SEAMONKEYPROFILEMIGRATOR_CID,
|
||||||
NS_BROWSERPROFILEMIGRATOR_CONTRACTID_PREFIX "seamonkey",
|
NS_BROWSERPROFILEMIGRATOR_CONTRACTID_PREFIX "seamonkey",
|
||||||
nsSeamonkeyProfileMigratorConstructor },
|
nsSeamonkeyProfileMigratorConstructor }
|
||||||
|
|
||||||
{ "Netscape 4.x Profile Migrator",
|
|
||||||
NS_DOGBERTPROFILEMIGRATOR_CID,
|
|
||||||
NS_BROWSERPROFILEMIGRATOR_CONTRACTID_PREFIX "dogbert",
|
|
||||||
nsDogbertProfileMigratorConstructor }
|
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user