blam r550 - in trunk: libblam src

[cmartin svn gnome org]

Author: cmartin
Date: Sat Apr 19 21:39:30 2008
New Revision: 550
URL: http://svn.gnome.org/viewvc/blam?rev=550&view=rev

Log:
Move some of the Gecko init to manged code.


Modified:
   trunk/libblam/blam-gecko-utils.cpp
   trunk/src/Defines.cs.in
   trunk/src/Makefile.am
   trunk/src/Utils.cs

Modified: trunk/libblam/blam-gecko-utils.cpp
==============================================================================
--- trunk/libblam/blam-gecko-utils.cpp	(original)
+++ trunk/libblam/blam-gecko-utils.cpp	Sat Apr 19 21:39:30 2008
@@ -186,20 +186,6 @@
 extern "C" void
 blam_gecko_utils_init_services (void)
 {
-	gchar *profile_dir;
-	
-	gtk_moz_embed_set_comp_path (MOZILLA_HOME);
-	
-	profile_dir = g_build_filename (g_getenv ("HOME"), 
-					".gnome2",
-					"blam",
-					"mozilla", NULL);
-
-	gtk_moz_embed_set_profile_path (profile_dir, "blam");
-	g_free (profile_dir);
-
-	gtk_moz_embed_push_startup ();
-        
 	gecko_prefs_set_string ("font.size.unit", "pt");
 	gecko_utils_init_chrome ();
 }

Modified: trunk/src/Defines.cs.in
==============================================================================
--- trunk/src/Defines.cs.in	(original)
+++ trunk/src/Defines.cs.in	Sat Apr 19 21:39:30 2008
@@ -13,6 +13,7 @@
     public class Defines {
 	public static string VERSION = "@version@";
 	public static string DATADIR = "@datadir@";
+	public static string MOZ_HOME = "@moz_home@";
 	public static string APP_DATADIR = DATADIR + "/blam";
 	public static string APP_HOMEDIR = Environment.GetEnvironmentVariable("HOME") + "/.gnome2/blam";
 	public static string GNOME_LOCALE_DIR = DATADIR + "/locale";

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Sat Apr 19 21:39:30 2008
@@ -54,6 +54,7 @@
 Defines.cs: Defines.cs.in ../config.log
 	sed -e "s|\ version\@|$(VERSION)|" \
 	    -e "s|\ datadir\@|$(datadir)|" \
+	    -e "s|\ moz_home\@|$(MOZILLA_HOME)|" \
 	    < Defines.cs.in > Defines.cs
 
 blamlibdir = $(prefix)/lib/blam

Modified: trunk/src/Utils.cs
==============================================================================
--- trunk/src/Utils.cs	(original)
+++ trunk/src/Utils.cs	Sat Apr 19 21:39:30 2008
@@ -44,6 +44,9 @@
             static extern void blam_gecko_utils_init_services ();
         public static void GeckoInit ()
         {
+            Gecko.WebControl.CompPath = Defines.MOZ_HOME;
+            Gecko.WebControl.SetProfilePath(Defines.APP_HOMEDIR + "/mozilla", "blam");
+            Gecko.WebControl.PushStartup();
             blam_gecko_utils_init_services ();
         }