epiphany r8103 - in trunk: data/chrome embed/mozilla

[chpe svn gnome org]

Author: chpe
Date: Thu Mar 13 16:20:09 2008
New Revision: 8103
URL: http://svn.gnome.org/viewvc/epiphany?rev=8103&view=rev

Log:
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.


Added:
   trunk/data/chrome/app-chrome.manifest.in
      - copied unchanged from r8092, /trunk/data/chrome/epiphany.manifest.in
Removed:
   trunk/data/chrome/epiphany.manifest.in
Modified:
   trunk/data/chrome/Makefile.am
   trunk/embed/mozilla/mozilla-embed-single.cpp

Modified: trunk/data/chrome/Makefile.am
==============================================================================
--- trunk/data/chrome/Makefile.am	(original)
+++ trunk/data/chrome/Makefile.am	Thu Mar 13 16:20:09 2008
@@ -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

Modified: trunk/embed/mozilla/mozilla-embed-single.cpp
==============================================================================
--- trunk/embed/mozilla/mozilla-embed-single.cpp	(original)
+++ trunk/embed/mozilla/mozilla-embed-single.cpp	Thu Mar 13 16:20:09 2008
@@ -627,24 +627,27 @@
 	  *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 ();