diff options
| author | Christian Persch <chpe@src.gnome.org> | 2007-12-24 06:38:56 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2007-12-24 06:38:56 +0800 |
| commit | 2ba7016f4b42ec9e8b7d5ef38b1c2a48ec390d4f (patch) | |
| tree | 2a2d93127a756442e990fb635dba508d809aaf13 | |
| parent | a29474a22ebb70a760712605ad738c6117661d22 (diff) | |
| download | gsoc2013-epiphany-2ba7016f4b42ec9e8b7d5ef38b1c2a48ec390d4f.tar gsoc2013-epiphany-2ba7016f4b42ec9e8b7d5ef38b1c2a48ec390d4f.tar.gz gsoc2013-epiphany-2ba7016f4b42ec9e8b7d5ef38b1c2a48ec390d4f.tar.bz2 gsoc2013-epiphany-2ba7016f4b42ec9e8b7d5ef38b1c2a48ec390d4f.tar.lz gsoc2013-epiphany-2ba7016f4b42ec9e8b7d5ef38b1c2a48ec390d4f.tar.xz gsoc2013-epiphany-2ba7016f4b42ec9e8b7d5ef38b1c2a48ec390d4f.tar.zst gsoc2013-epiphany-2ba7016f4b42ec9e8b7d5ef38b1c2a48ec390d4f.zip | |
Xr 1.9 fixes. Bug #503657.
svn path=/trunk/; revision=7808
| -rw-r--r-- | embed/mozilla/MozRegisterComponents.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/embed/mozilla/MozRegisterComponents.cpp b/embed/mozilla/MozRegisterComponents.cpp index e712bbc5d..3960052bf 100644 --- a/embed/mozilla/MozRegisterComponents.cpp +++ b/embed/mozilla/MozRegisterComponents.cpp @@ -137,12 +137,14 @@ static const nsModuleComponentInfo sAppComps[] = { NS_CLIENTAUTHDIALOGS_CONTRACTID, GtkNSSClientAuthDialogsConstructor }, +#ifndef HAVE_GECKO_1_9 { GTK_NSSDIALOGS_CLASSNAME, GTK_NSSDIALOGS_CID, NS_BADCERTLISTENER_CONTRACTID, GtkNSSDialogsConstructor }, +#endif { GTK_NSSDIALOGS_CLASSNAME, GTK_NSSDIALOGS_CID, @@ -296,9 +298,15 @@ mozilla_register_components (void) for (guint i = 0; i < G_N_ELEMENTS (sAppComps); i++) { nsCOMPtr<nsIGenericFactory> componentFactory; - rv = NS_NewGenericFactory(getter_AddRefs(componentFactory), - &(sAppComps[i])); - if (NS_FAILED(rv) || !componentFactory) + componentFactory = do_CreateInstance(NS_GENERICFACTORY_CONTRACTID); + if(!componentFactory) + { + g_warning ("Failed to create a generic factory for %s\n", sAppComps[i].mDescription); + ret = FALSE; + continue; + } + rv = componentFactory->SetComponentInfo(&(sAppComps[i])); + if (NS_FAILED(rv)) { g_warning ("Failed to make a factory for %s\n", sAppComps[i].mDescription); |