aboutsummaryrefslogtreecommitdiffstats
path: root/embed
diff options
context:
space:
mode:
authorChristian Persch <chpe@src.gnome.org>2008-03-13 05:19:23 +0800
committerChristian Persch <chpe@src.gnome.org>2008-03-13 05:19:23 +0800
commit40174913b001abad51dd5a4d4c0ce142b0ace2f9 (patch)
tree93b6255a80554186318b41748265874e95b84974 /embed
parentb46cc50c0935c57676449c71e6f4101128f27ce6 (diff)
downloadgsoc2013-epiphany-40174913b001abad51dd5a4d4c0ce142b0ace2f9.tar
gsoc2013-epiphany-40174913b001abad51dd5a4d4c0ce142b0ace2f9.tar.gz
gsoc2013-epiphany-40174913b001abad51dd5a4d4c0ce142b0ace2f9.tar.bz2
gsoc2013-epiphany-40174913b001abad51dd5a4d4c0ce142b0ace2f9.tar.lz
gsoc2013-epiphany-40174913b001abad51dd5a4d4c0ce142b0ace2f9.tar.xz
gsoc2013-epiphany-40174913b001abad51dd5a4d4c0ce142b0ace2f9.tar.zst
gsoc2013-epiphany-40174913b001abad51dd5a4d4c0ce142b0ace2f9.zip
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
Diffstat (limited to 'embed')
-rw-r--r--embed/mozilla/mozilla-embed-single.cpp8
1 files 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 ();