From 40174913b001abad51dd5a4d4c0ce142b0ace2f9 Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Wed, 12 Mar 2008 21:19:23 +0000 Subject: Try to fix the gecko 1.8 backend, and this also might fix the branding bundle not working on 1.9 svn path=/trunk/; revision=8100 --- embed/mozilla/mozilla-embed-single.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp index 92108425a..082e2cff2 100644 --- a/embed/mozilla/mozilla-embed-single.cpp +++ b/embed/mozilla/mozilla-embed-single.cpp @@ -196,7 +196,7 @@ mozilla_set_default_prefs (MozillaEmbedSingle *mes) pref->ClearUserPref ("general.useragent.vendorSub"); /* Don't open ftp uris with an external handler if one is setup */ - pref->SetBoolPref ("network.protocol-handler.external.ftp", PR_FALSE); + pref->SetBoolPref ("network.protocol-handler.external.ftp", PR_FALSE); return TRUE; } @@ -332,7 +332,6 @@ mozilla_init_profile (void) profile_path = g_build_filename (ephy_dot_dir (), MOZILLA_PROFILE_DIR, (char *) NULL); - gtk_moz_embed_set_comp_path (profile_path); gtk_moz_embed_set_profile_path (profile_path, MOZILLA_PROFILE_NAME); g_free (profile_path); } @@ -635,9 +634,6 @@ impl_init (EphyEmbedSingle *esingle) gtk_moz_embed_set_comp_path (MOZILLA_HOME); #endif #endif // XPCOM_GLUE - /* Fire up the beast */ - gtk_moz_embed_push_startup (); - /* Pre initialization */ mozilla_init_plugin_path (); @@ -654,6 +650,8 @@ impl_init (EphyEmbedSingle *esingle) gtk_moz_embed_set_directory_service_provider (dp); + /* Fire up the beast */ + gtk_moz_embed_push_startup (); /* FIXME check that it succeeded! */ mozilla_register_components (); -- cgit