conduit r1743 - in trunk: . conduit

[jstowers svn gnome org]

Author: jstowers
Date: Sun Oct  5 13:40:19 2008
New Revision: 1743
URL: http://svn.gnome.org/viewvc/conduit?rev=1743&view=rev

Log:
2008-10-05  John Stowers  <john stowers gmail com>

	* conduit/Main.py:
	* conduit/__init__.py:
	* conduit/conduit:
	* conduit/defs.py.in: Change the default file and browser implementations 
	to GIO and webkit. If running uninstalled you can override these by 
	setting the env variables CONDUIT_FILE_IMPL and CONDUIT_BROWSER_IMPL



Modified:
   trunk/ChangeLog
   trunk/conduit/Main.py
   trunk/conduit/__init__.py
   trunk/conduit/conduit
   trunk/conduit/defs.py.in

Modified: trunk/conduit/Main.py
==============================================================================
--- trunk/conduit/Main.py	(original)
+++ trunk/conduit/Main.py	Sun Oct  5 13:40:19 2008
@@ -98,6 +98,7 @@
 
         log.info("Conduit v%s Installed: %s" % (conduit.VERSION, conduit.IS_INSTALLED))
         log.info("Python: %s" % sys.version)
+        log.info("Platform Implementations: %s,%s,%s" % (conduit.FILE_IMPL,conduit.BROWSER_IMPL, conduit.SETTINGS_IMPL))
         if settings:
             log.info("Settings have been overridden: %s" % settings)
         

Modified: trunk/conduit/__init__.py
==============================================================================
--- trunk/conduit/__init__.py	(original)
+++ trunk/conduit/__init__.py	Sun Oct  5 13:40:19 2008
@@ -53,9 +53,9 @@
     GLADE_FILE =                os.path.join(DIRECTORY, "data","conduit.glade")
     SHARED_MODULE_DIR =         os.path.join(DIRECTORY, "conduit", "modules")
                                 #{GnomeVfs, GIO, Python}
-    FILE_IMPL =                 os.environ.get("CONDUIT_FILE_IMPL","GnomeVfs")
+    FILE_IMPL =                 os.environ.get("CONDUIT_FILE_IMPL","GIO")
                                 #{gtkmozembed, webkit, system}
-    BROWSER_IMPL =              os.environ.get("CONDUIT_BROWSER_IMPL","gtkmozembed")
+    BROWSER_IMPL =              os.environ.get("CONDUIT_BROWSER_IMPL","webkit")
                                 #{GConf,Python}
     SETTINGS_IMPL =             os.environ.get("CONDUIT_SETTINGS_IMPL","GConf")
 

Modified: trunk/conduit/conduit
==============================================================================
--- trunk/conduit/conduit	(original)
+++ trunk/conduit/conduit	Sun Oct  5 13:40:19 2008
@@ -8,20 +8,20 @@
 # Run mozilla takes care of settin up the appropriate environment variables
 # to run a program using mozilla libs
 
-export LD_LIBRARY_PATH=/opt/gio/lib/
-export PYTHONPATH=/opt/gio/lib/python2.5/site-packages/gtk-2.0/
+if [ x$CONDUIT_BROWSER_IMPL = x"gtkmozembed" ]; then
+    for d in `ls -d /usr/lib*/firefox* /usr/lib*/mozilla-firefox* 2> /dev/null | sort -r`
+    do
+        if [ -x $d/run-mozilla.sh ]; then
+            echo INFO: FOUND FIREFOX LIBS AT $d
+            $d/run-mozilla.sh `dirname $0`/conduit.real $*
+            exit
+        fi
+    done
 
-for d in `ls -d /usr/lib*/firefox* /usr/lib*/mozilla-firefox* 2> /dev/null | sort -r`
-do
-    if [ -x $d/run-mozilla.sh ]; then
-        echo INFO: FOUND FIREFOX LIBS AT $d
-        $d/run-mozilla.sh `dirname $0`/conduit.real $*
-        exit
-    fi
-done
+    echo "WARNING: COULD NOT FIND FIREFOX LIBRARIES"
+    echo "WARNING: CONDUIT MAY CRASH UNEXPECTEDLY"
+    echo "WARNING: PLEASE TALK TO THE PERSON WHO PACKAGED CONDUIT"
+fi
 
-echo "WARNING: COULD NOT FIND FIREFOX LIBRARIES"
-echo "WARNING: CONDUIT MAY CRASH UNEXPECTEDLY"
-echo "WARNING: PLEASE TALK TO THE PERSON WHO PACKAGED CONDUIT"
 `dirname $0`/conduit.real $*
 

Modified: trunk/conduit/defs.py.in
==============================================================================
--- trunk/conduit/defs.py.in	(original)
+++ trunk/conduit/defs.py.in	Sun Oct  5 13:40:19 2008
@@ -11,10 +11,10 @@
 #
 
 #{GnomeVfs, GIO, Python}
-FILE_IMPL = "GnomeVfs"
+FILE_IMPL = "GIO"
 
 #{gtkmozembed, webkit, system}
-BROWSER_IMPL = "gtkmozembed"
+BROWSER_IMPL = "webkit"
 
 #{GConf,Python}
 SETTINGS_IMPL = "GConf"