blam r593 - in trunk: . src

[atoker svn gnome org]

Author: atoker
Date: Sun Jun 15 19:56:08 2008
New Revision: 593
URL: http://svn.gnome.org/viewvc/blam?rev=593&view=rev

Log:
Eliminate some Mozilla cruft


Modified:
   trunk/Makefile.am
   trunk/blam.in
   trunk/src/Defines.cs.in
   trunk/src/Makefile.am
   trunk/src/Utils.cs

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Sun Jun 15 19:56:08 2008
@@ -34,7 +34,7 @@
 man_MANS = blam.1
 
 blam: blam.in config.log
-	sed -e "s|\ prefix\@|$(prefix)|" -e "s|\ MOZILLA_HOME\@|$(MOZILLA_HOME)|g" < blam.in > blam
+	sed -e "s|\ prefix\@|$(prefix)|" < blam.in > blam
 
 configdir = $(prefix)/lib/blam
 config_DATA = blam.exe.config

Modified: trunk/blam.in
==============================================================================
--- trunk/blam.in	(original)
+++ trunk/blam.in	Sun Jun 15 19:56:08 2008
@@ -1,4 +1,3 @@
-#!/bin/bash
+#!/bin/sh
 
-LD_LIBRARY_PATH="@prefix@/lib/blam:@MOZILLA_HOME ${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}" MOZILLA_FIVE_HOME= MOZILLA_HOME@ \
-MOZILLA_HOME= MOZILLA_HOME@ exec -a 'blam' mono @prefix@/lib/blam/blam.exe $@
+exec -a 'blam' mono @prefix@/lib/blam/blam.exe $@

Modified: trunk/src/Defines.cs.in
==============================================================================
--- trunk/src/Defines.cs.in	(original)
+++ trunk/src/Defines.cs.in	Sun Jun 15 19:56:08 2008
@@ -13,7 +13,6 @@
     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	Sun Jun 15 19:56:08 2008
@@ -51,7 +51,6 @@
 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	Sun Jun 15 19:56:08 2008
@@ -24,18 +24,6 @@
     public class Utils {
 
         [DllImport("libblam.so")]
-            static extern void blam_gecko_utils_init_services ();
-        public static void GeckoInit ()
-        {
-#if USE_GECKO
-            Gecko.WebControl.CompPath = Defines.MOZ_HOME;
-            Gecko.WebControl.SetProfilePath(Defines.APP_HOMEDIR + "/mozilla", "blam");
-            Gecko.WebControl.PushStartup();
-            blam_gecko_utils_init_services ();
-#endif
-        }
-
-        [DllImport("libblam.so")]
         static extern int blam_gecko_get_mouse_button(IntPtr dom_event);
         public static int GeckoGetMouseButton(IntPtr dom_event)
         {