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

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 ();