aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@src.gnome.org>2008-03-14 00:20:09 +0800
committerChristian Persch <chpe@src.gnome.org>2008-03-14 00:20:09 +0800
commitd6283ddb95db1767357cf37d628c6fded623de1e (patch)
tree010faf9fb3700b5447c6d63aadc2b2e8b2ea6db5
parentde1fa499ba85d8f8d0e108eb1596f7ae646048ff (diff)
downloadgsoc2013-epiphany-d6283ddb95db1767357cf37d628c6fded623de1e.tar
gsoc2013-epiphany-d6283ddb95db1767357cf37d628c6fded623de1e.tar.gz
gsoc2013-epiphany-d6283ddb95db1767357cf37d628c6fded623de1e.tar.bz2
gsoc2013-epiphany-d6283ddb95db1767357cf37d628c6fded623de1e.tar.lz
gsoc2013-epiphany-d6283ddb95db1767357cf37d628c6fded623de1e.tar.xz
gsoc2013-epiphany-d6283ddb95db1767357cf37d628c6fded623de1e.tar.zst
gsoc2013-epiphany-d6283ddb95db1767357cf37d628c6fded623de1e.zip
Fix the branding bundle registration by providing the app chrome manifest in the right directory, and set that directory as the component directory with gtk_moz_embed_set_comp_path.
svn path=/trunk/; revision=8103
-rw-r--r--data/chrome/Makefile.am2
-rw-r--r--data/chrome/app-chrome.manifest.in (renamed from data/chrome/epiphany.manifest.in)0
-rw-r--r--embed/mozilla/mozilla-embed-single.cpp7
3 files changed, 6 insertions, 3 deletions
diff --git a/data/chrome/Makefile.am b/data/chrome/Makefile.am
index 42c1ae96f..45419f902 100644
--- a/data/chrome/Makefile.am
+++ b/data/chrome/Makefile.am
@@ -1,5 +1,5 @@
manifestdir = $(pkgdatadir)/chrome
-manifest_in_files = epiphany.manifest.in
+manifest_in_files = app-chrome.manifest.in
manifest_DATA = $(manifest_in_files:.manifest.in=.manifest)
%.manifest: %.manifest.in
diff --git a/data/chrome/epiphany.manifest.in b/data/chrome/app-chrome.manifest.in
index f75c35f04..f75c35f04 100644
--- a/data/chrome/epiphany.manifest.in
+++ b/data/chrome/app-chrome.manifest.in
diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp
index f2a588f41..2a0846c35 100644
--- a/embed/mozilla/mozilla-embed-single.cpp
+++ b/embed/mozilla/mozilla-embed-single.cpp
@@ -627,24 +627,27 @@ impl_init (EphyEmbedSingle *esingle)
*lastSlash = '\0';
gtk_moz_embed_set_path(xpcomLocation);
- gtk_moz_embed_set_comp_path (MOZILLA_HOME);
+ gtk_moz_embed_set_comp_path (SHARE_DIR);
#else
#ifdef HAVE_GECKO_1_9
gtk_moz_embed_set_path (MOZILLA_HOME);
-
+ gtk_moz_embed_set_comp_path (SHARE_DIR);
#else
gtk_moz_embed_set_comp_path (MOZILLA_HOME);
#endif
#endif // XPCOM_GLUE
+
/* Pre initialization */
mozilla_init_plugin_path ();
mozilla_init_profile ();
+#ifndef HAVE_GECKO_1_9
nsCOMPtr<nsIDirectoryServiceProvider> dp = new EphyDirectoryProvider ();
if (!dp) return FALSE;
gtk_moz_embed_set_directory_service_provider (dp);
+#endif
/* Fire up the beast */
gtk_moz_embed_push_startup ();