conduit r1276 - in trunk: . conduit/dataproviders conduit/modules/FlickrModule conduit/modules/GoogleModule conduit/modules/ShutterflyModule conduit/modules/SmugMugModule

[jstowers svn gnome org]

Author: jstowers
Date: Tue Feb  5 23:45:17 2008
New Revision: 1276
URL: http://svn.gnome.org/viewvc/conduit?rev=1276&view=rev

Log:
2008-02-06  John Stowers  <john stowers gmail com>

	* conduit/dataproviders/Image.py:
	* conduit/modules/FlickrModule/FlickrModule.py:
	* conduit/modules/GoogleModule/GoogleModule.py:
	* conduit/modules/ShutterflyModule/ShutterflyModule.py:
	* conduit/modules/SmugMugModule/SmugMugModule.py: Add username property
	back to relevant modules. The last commit broke it.



Modified:
   trunk/ChangeLog
   trunk/conduit/dataproviders/Image.py
   trunk/conduit/modules/FlickrModule/FlickrModule.py
   trunk/conduit/modules/GoogleModule/GoogleModule.py
   trunk/conduit/modules/ShutterflyModule/ShutterflyModule.py
   trunk/conduit/modules/SmugMugModule/SmugMugModule.py

Modified: trunk/conduit/dataproviders/Image.py
==============================================================================
--- trunk/conduit/dataproviders/Image.py	(original)
+++ trunk/conduit/dataproviders/Image.py	Tue Feb  5 23:45:17 2008
@@ -159,9 +159,6 @@
                 }
         return args
         
-    def set_configuration(self, config):
-        DataProvider.DataSink.set_configuration(self, config)
-    
 class ImageTwoWay(DataProvider.DataSource, ImageSink):
     """
     Abstract Base Class for ImageTwoWay dataproviders

Modified: trunk/conduit/modules/FlickrModule/FlickrModule.py
==============================================================================
--- trunk/conduit/modules/FlickrModule/FlickrModule.py	(original)
+++ trunk/conduit/modules/FlickrModule/FlickrModule.py	Tue Feb  5 23:45:17 2008
@@ -72,6 +72,7 @@
         Image.ImageTwoWay.__init__(self)
         self.fapi = None
         self.token = None
+        self.username = ""
         self.photoSetName = ""
         self.showPublic = True
         self.photoSetId = None

Modified: trunk/conduit/modules/GoogleModule/GoogleModule.py
==============================================================================
--- trunk/conduit/modules/GoogleModule/GoogleModule.py	(original)
+++ trunk/conduit/modules/GoogleModule/GoogleModule.py	Tue Feb  5 23:45:17 2008
@@ -526,12 +526,10 @@
 
     def __init__(self, *args):
         Image.ImageTwoWay.__init__(self)
-        
         self.username = ""
         self.password = ""
         self.album = ""
         self.imageSize = "None"
-
         self.pws = gdata.photos.service.PhotosService()
         self.galbum = None
         self.gphoto_dict = None

Modified: trunk/conduit/modules/ShutterflyModule/ShutterflyModule.py
==============================================================================
--- trunk/conduit/modules/ShutterflyModule/ShutterflyModule.py	(original)
+++ trunk/conduit/modules/ShutterflyModule/ShutterflyModule.py	Tue Feb  5 23:45:17 2008
@@ -30,11 +30,9 @@
 	
 	def __init__(self, *args):
 		Image.ImageSink.__init__(self)
-		
 		self.username = ""
 		self.password = ""
 		self.album = ""
-		
 		self.sapi = None
 		self.salbum = None
 		self.sphotos = None
@@ -143,13 +141,10 @@
 	def is_configured(self, isSource, isTwoWay):
 		if len(self.username) < 1:
 			return False
-		
 		if len(self.password) < 1:
 			return False
-		
 		if len(self.album) < 1:
 			return False
-		
 		return True
 	
 	def get_UID(self):

Modified: trunk/conduit/modules/SmugMugModule/SmugMugModule.py
==============================================================================
--- trunk/conduit/modules/SmugMugModule/SmugMugModule.py	(original)
+++ trunk/conduit/modules/SmugMugModule/SmugMugModule.py	Tue Feb  5 23:45:17 2008
@@ -32,6 +32,7 @@
 
     def __init__(self, *args):
         Image.ImageTwoWay.__init__(self)
+        self.username = ""
         self.password = ""
         self.album = ""
         self.imageSize = "None"