conduit r1708 - in trunk: . conduit

[jstowers svn gnome org]

Author: jstowers
Date: Fri Aug 29 23:41:53 2008
New Revision: 1708
URL: http://svn.gnome.org/viewvc/conduit?rev=1708&view=rev

Log:
	* conduit/__init__.py:
	* conduit/defs.py.in: When not installed one can override the the
	FILE/BROWSER/SETTING implementation by using CONDUIT_XX_IMPL env variable.


Modified:
   trunk/   (props changed)
   trunk/ChangeLog
   trunk/conduit/__init__.py
   trunk/conduit/defs.py.in

Modified: trunk/conduit/__init__.py
==============================================================================
--- trunk/conduit/__init__.py	(original)
+++ trunk/conduit/__init__.py	Fri Aug 29 23:41:53 2008
@@ -52,9 +52,12 @@
     SHARED_DATA_DIR =           os.path.join(DIRECTORY, "data")
     GLADE_FILE =                os.path.join(DIRECTORY, "data","conduit.glade")
     SHARED_MODULE_DIR =         os.path.join(DIRECTORY, "conduit", "modules")
-    FILE_IMPL =                 "GnomeVfs"      #{GnomeVfs, GIO, Python}
-    BROWSER_IMPL =              "gtkmozembed"   #{gtkmozembed, webkit, system}
-    SETTINGS_IMPL =             "GConf"         #{GConf,Python}
+                                #{GnomeVfs, GIO, Python}
+    FILE_IMPL =                 os.environ.get("CONDUIT_FILE_IMPL","GnomeVfs")
+                                #{gtkmozembed, webkit, system}
+    BROWSER_IMPL =              os.environ.get("CONDUIT_BROWSER_IMPL","gtkmozembed")
+                                #{GConf,Python}
+    SETTINGS_IMPL =             os.environ.get("CONDUIT_SETTINGS_IMPL","GConf")
 
 import Globals
 GLOBALS = Globals.Globals()

Modified: trunk/conduit/defs.py.in
==============================================================================
--- trunk/conduit/defs.py.in	(original)
+++ trunk/conduit/defs.py.in	Fri Aug 29 23:41:53 2008
@@ -10,6 +10,9 @@
 # Platform specific implementations
 #
 
+#{GnomeVfs, GIO, Python}
+FILE_IMPL = "GnomeVfs"
+
 #{gtkmozembed, webkit, system}
 BROWSER_IMPL = "gtkmozembed"