[conduit] Merged Shutterfly modification from config-unstable

[Alexandre Rosenfeld <arosenfeld src gnome org>]

commit 99169c4e79f2c5c6bb0abc65d492cb6adef9b41f
Author: Alexandre Rosenfeld <airmind gmail com>
Date:   Sat Apr 18 00:00:09 2009 -0300

    Merged Shutterfly modification from config-unstable
---
 .../modules/ShutterflyModule/ShutterflyModule.py   |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/conduit/modules/ShutterflyModule/ShutterflyModule.py b/conduit/modules/ShutterflyModule/ShutterflyModule.py
index c013dfc..beefae7 100644
--- a/conduit/modules/ShutterflyModule/ShutterflyModule.py
+++ b/conduit/modules/ShutterflyModule/ShutterflyModule.py
@@ -102,7 +102,21 @@ class ShutterflySink(Image.ImageSink):
 		except Exception, e:
 			raise Exceptions.SyncronizeError("Shutterfly Upload Error.")
 	
-	def configure(self, window):
+	def config_setup(self, config):
+		config.add_section('Account details')
+		config.add_item('Username', 'text',
+			config_name = 'username',
+		)
+		config.add_item('Password', 'text',
+			config_name = 'password',
+			password = True
+		)
+		config.add_section('Saved photo settings')
+		config.add_item('Album', 'text',
+			config_name = 'album',
+		)	
+	
+	def configure_(self, window):
 		"""
 		Configures the ShutterflySink
 		"""