conduit r1804 - in trunk: . conduit/gtkui conduit/modules

[jstowers svn gnome org]

Author: jstowers
Date: Sun Jan 18 03:02:58 2009
New Revision: 1804
URL: http://svn.gnome.org/viewvc/conduit?rev=1804&view=rev

Log:
2009-01-18  John Stowers  <john stowers gmail com>

	* conduit/gtkui/SimpleConfigurator.py: Add hack to allow password types
	in SimpleConfigurator.

	* conduit/modules/GoogleBookmarksModule.py
	* conduit/modules/Makefile.am: Add new Google bookmarks datasource.
	Fixes #568091 (Andrew Stormont)



Modified:
   trunk/ChangeLog
   trunk/conduit/gtkui/SimpleConfigurator.py
   trunk/conduit/modules/Makefile.am

Modified: trunk/conduit/gtkui/SimpleConfigurator.py
==============================================================================
--- trunk/conduit/gtkui/SimpleConfigurator.py	(original)
+++ trunk/conduit/gtkui/SimpleConfigurator.py	Sun Jan 18 03:02:58 2009
@@ -129,9 +129,13 @@
                 label = gtk.Label(l["Title"])
             if 'Kind' in l:
                 kind = l['Kind']
-                widget = {'text': gtk.Entry,
-                          'list': gtk.combo_box_new_text,
-                          'check': gtk.CheckButton}[kind]()
+                # I'm sure john will hate this
+                password = gtk.Entry()
+                password.set_visibility( False )
+                widget = {'text': gtk.Entry(),
+                          'list': gtk.combo_box_new_text(),
+                          'check': gtk.CheckButton(),
+                          'password': password }[kind]
             elif 'Widget' in l:
                 kind = None
                 #New instance of the widget

Modified: trunk/conduit/modules/Makefile.am
==============================================================================
--- trunk/conduit/modules/Makefile.am	(original)
+++ trunk/conduit/modules/Makefile.am	Sun Jan 18 03:02:58 2009
@@ -24,7 +24,8 @@
 	TomboyModule.py \
 	ConverterModule.py \
 	PhotoConverterModule.py \
-	AudioVideoConverterModule.py
+	AudioVideoConverterModule.py \
+	GoogleBookmarksModule.py
 
 clean-local:
 	rm -rf *.pyc *.pyo