From ddad872cf5ef9886791e8289f3715a03badab5ba Mon Sep 17 00:00:00 2001 From: "hyatt%netscape.com" Date: Mon, 29 Apr 2002 22:03:34 +0000 Subject: [PATCH] GOD DAMMIT. --- camino/CHPreferenceManager.mm | 13 ++++++------- camino/src/preferences/PreferenceManager.mm | 13 ++++++------- chimera/CHPreferenceManager.mm | 13 ++++++------- chimera/src/preferences/PreferenceManager.mm | 13 ++++++------- 4 files changed, 24 insertions(+), 28 deletions(-) diff --git a/camino/CHPreferenceManager.mm b/camino/CHPreferenceManager.mm index fb3c784ffbe..2e3d44f9779 100644 --- a/camino/CHPreferenceManager.mm +++ b/camino/CHPreferenceManager.mm @@ -62,7 +62,12 @@ extern const char *prefContractID; setenv("MOZILLA_FIVE_HOME", cstr, 1); nsresult rv; - + rv = NS_InitEmbedding(nsnull, nsnull); + if (NS_FAILED(rv)) { + printf("Embedding init failed.\n"); + return NO; + } + nsCOMPtr profileService(do_GetService(NS_PROFILE_CONTRACTID, &rv)); if (NS_FAILED(rv)) return NO; @@ -83,12 +88,6 @@ extern const char *prefContractID; if (NS_FAILED(rv)) return NO; - rv = NS_InitEmbedding(nsnull, nsnull); - if (NS_FAILED(rv)) { - printf("Embedding init failed.\n"); - return NO; - } - [self syncMozillaPrefs]; return YES; } diff --git a/camino/src/preferences/PreferenceManager.mm b/camino/src/preferences/PreferenceManager.mm index fb3c784ffbe..2e3d44f9779 100644 --- a/camino/src/preferences/PreferenceManager.mm +++ b/camino/src/preferences/PreferenceManager.mm @@ -62,7 +62,12 @@ extern const char *prefContractID; setenv("MOZILLA_FIVE_HOME", cstr, 1); nsresult rv; - + rv = NS_InitEmbedding(nsnull, nsnull); + if (NS_FAILED(rv)) { + printf("Embedding init failed.\n"); + return NO; + } + nsCOMPtr profileService(do_GetService(NS_PROFILE_CONTRACTID, &rv)); if (NS_FAILED(rv)) return NO; @@ -83,12 +88,6 @@ extern const char *prefContractID; if (NS_FAILED(rv)) return NO; - rv = NS_InitEmbedding(nsnull, nsnull); - if (NS_FAILED(rv)) { - printf("Embedding init failed.\n"); - return NO; - } - [self syncMozillaPrefs]; return YES; } diff --git a/chimera/CHPreferenceManager.mm b/chimera/CHPreferenceManager.mm index fb3c784ffbe..2e3d44f9779 100644 --- a/chimera/CHPreferenceManager.mm +++ b/chimera/CHPreferenceManager.mm @@ -62,7 +62,12 @@ extern const char *prefContractID; setenv("MOZILLA_FIVE_HOME", cstr, 1); nsresult rv; - + rv = NS_InitEmbedding(nsnull, nsnull); + if (NS_FAILED(rv)) { + printf("Embedding init failed.\n"); + return NO; + } + nsCOMPtr profileService(do_GetService(NS_PROFILE_CONTRACTID, &rv)); if (NS_FAILED(rv)) return NO; @@ -83,12 +88,6 @@ extern const char *prefContractID; if (NS_FAILED(rv)) return NO; - rv = NS_InitEmbedding(nsnull, nsnull); - if (NS_FAILED(rv)) { - printf("Embedding init failed.\n"); - return NO; - } - [self syncMozillaPrefs]; return YES; } diff --git a/chimera/src/preferences/PreferenceManager.mm b/chimera/src/preferences/PreferenceManager.mm index fb3c784ffbe..2e3d44f9779 100644 --- a/chimera/src/preferences/PreferenceManager.mm +++ b/chimera/src/preferences/PreferenceManager.mm @@ -62,7 +62,12 @@ extern const char *prefContractID; setenv("MOZILLA_FIVE_HOME", cstr, 1); nsresult rv; - + rv = NS_InitEmbedding(nsnull, nsnull); + if (NS_FAILED(rv)) { + printf("Embedding init failed.\n"); + return NO; + } + nsCOMPtr profileService(do_GetService(NS_PROFILE_CONTRACTID, &rv)); if (NS_FAILED(rv)) return NO; @@ -83,12 +88,6 @@ extern const char *prefContractID; if (NS_FAILED(rv)) return NO; - rv = NS_InitEmbedding(nsnull, nsnull); - if (NS_FAILED(rv)) { - printf("Embedding init failed.\n"); - return NO; - } - [self syncMozillaPrefs]; return YES; }