conduit r1476 - in trunk: . conduit conduit/modules

[jstowers svn gnome org]

Author: jstowers
Date: Sun May 25 00:45:24 2008
New Revision: 1476
URL: http://svn.gnome.org/viewvc/conduit?rev=1476&view=rev

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

	* conduit/Main.py:
	* conduit/modules/TestModule.py: Print overridden settings.



Modified:
   trunk/ChangeLog
   trunk/conduit/Main.py
   trunk/conduit/modules/TestModule.py

Modified: trunk/conduit/Main.py
==============================================================================
--- trunk/conduit/Main.py	(original)
+++ trunk/conduit/Main.py	Sun May 25 00:45:24 2008
@@ -48,6 +48,7 @@
         whitelist = None
         blacklist = None
         self.ui = "gtk"
+        settings = {}
         try:
             opts, args = getopt.getopt(
                             sys.argv[1:],
@@ -76,7 +77,6 @@
                 if o in ("-x", "--without-modules"):
                     blacklist = a.split(",")
                 if o in ("-s", "--settings"):
-                    settings = {}
                     try:
                         for i in a.split(','):
                             k,v = i.split('=')
@@ -91,6 +91,8 @@
 
         log.info("Conduit v%s Installed: %s" % (conduit.VERSION, conduit.IS_INSTALLED))
         log.info("Python: %s" % sys.version)
+        if settings:
+            log.info("Settings have been overridden: %s" % settings)
         
         #Make conduit single instance. If conduit is already running then
         #make the original process build or show the gui

Modified: trunk/conduit/modules/TestModule.py
==============================================================================
--- trunk/conduit/modules/TestModule.py	(original)
+++ trunk/conduit/modules/TestModule.py	Sun May 25 00:45:24 2008
@@ -577,7 +577,7 @@
     def __init__(self, *args):
         TestTwoWay.__init__(self)
         self.url = "http://www.google.com";
-        self.browser = "gtkmozembed"
+        self.browser = conduit.GLOBALS.settings.get("web_login_browser")
 
     def configure(self, window):
         import gtk