diff options
| author | Christian Persch <chpe@src.gnome.org> | 2008-03-13 05:38:55 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2008-03-13 05:38:55 +0800 |
| commit | fdffd322181be333e39c2a039e37295587cf3284 (patch) | |
| tree | 5f90f0b38e4ff1e91e87b4d38e43080b5bb022c2 /embed/mozilla/mozilla-embed-single.cpp | |
| parent | 40174913b001abad51dd5a4d4c0ce142b0ace2f9 (diff) | |
| download | gsoc2013-epiphany-fdffd322181be333e39c2a039e37295587cf3284.tar gsoc2013-epiphany-fdffd322181be333e39c2a039e37295587cf3284.tar.gz gsoc2013-epiphany-fdffd322181be333e39c2a039e37295587cf3284.tar.bz2 gsoc2013-epiphany-fdffd322181be333e39c2a039e37295587cf3284.tar.lz gsoc2013-epiphany-fdffd322181be333e39c2a039e37295587cf3284.tar.xz gsoc2013-epiphany-fdffd322181be333e39c2a039e37295587cf3284.tar.zst gsoc2013-epiphany-fdffd322181be333e39c2a039e37295587cf3284.zip | |
Try again to fix the directory provider for 1.9. Branding still fails though
svn path=/trunk/; revision=8101
Diffstat (limited to 'embed/mozilla/mozilla-embed-single.cpp')
| -rw-r--r-- | embed/mozilla/mozilla-embed-single.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp index 082e2cff2..f2a588f41 100644 --- a/embed/mozilla/mozilla-embed-single.cpp +++ b/embed/mozilla/mozilla-embed-single.cpp @@ -627,9 +627,11 @@ impl_init (EphyEmbedSingle *esingle) *lastSlash = '\0'; gtk_moz_embed_set_path(xpcomLocation); + gtk_moz_embed_set_comp_path (MOZILLA_HOME); #else #ifdef HAVE_GECKO_1_9 gtk_moz_embed_set_path (MOZILLA_HOME); + #else gtk_moz_embed_set_comp_path (MOZILLA_HOME); #endif @@ -639,12 +641,6 @@ impl_init (EphyEmbedSingle *esingle) mozilla_init_profile (); -#ifdef HAVE_GECKO_1_9 - gtk_moz_embed_set_path (MOZILLA_HOME); -#endif - /* Set mozilla binary path */ - gtk_moz_embed_set_comp_path (MOZILLA_HOME); - nsCOMPtr<nsIDirectoryServiceProvider> dp = new EphyDirectoryProvider (); if (!dp) return FALSE; @@ -652,6 +648,7 @@ impl_init (EphyEmbedSingle *esingle) /* Fire up the beast */ gtk_moz_embed_push_startup (); + /* FIXME check that it succeeded! */ mozilla_register_components (); |