epiphany r8147 - branches/gnome-2-22/embed/mozilla

[chpe svn gnome org]

Author: chpe
Date: Fri Mar 28 15:07:20 2008
New Revision: 8147
URL: http://svn.gnome.org/viewvc/epiphany?rev=8147&view=rev

Log:
Try to fix the gecko 1.8 backend, and this also might fix the branding bundle not working on 1.9



Modified:
   branches/gnome-2-22/embed/mozilla/mozilla-embed-single.cpp

Modified: branches/gnome-2-22/embed/mozilla/mozilla-embed-single.cpp
==============================================================================
--- branches/gnome-2-22/embed/mozilla/mozilla-embed-single.cpp	(original)
+++ branches/gnome-2-22/embed/mozilla/mozilla-embed-single.cpp	Fri Mar 28 15:07:20 2008
@@ -196,7 +196,7 @@
 	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 @@
 	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 @@
         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 @@
 
 	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 ();