conduit r1445 - in trunk: . conduit/modules/FlickrModule

[jstowers svn gnome org]

Author: jstowers
Date: Mon May  5 11:27:38 2008
New Revision: 1445
URL: http://svn.gnome.org/viewvc/conduit?rev=1445&view=rev

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

	* conduit/modules/FlickrModule/FlickrModule.py: Dont duplicate first
	photo when creating photosets. Fixes #530980 (P. Henrique Silva)



Modified:
   trunk/ChangeLog
   trunk/conduit/modules/FlickrModule/FlickrModule.py

Modified: trunk/conduit/modules/FlickrModule/FlickrModule.py
==============================================================================
--- trunk/conduit/modules/FlickrModule/FlickrModule.py	(original)
+++ trunk/conduit/modules/FlickrModule/FlickrModule.py	Mon May  5 11:27:38 2008
@@ -127,10 +127,14 @@
         photoId = ret.photoid[0].elementText
 
         # check if phtotoset exists, if not create it
+        firstPhoto = False
         if not self.photoSetId:
             self.photoSetId = self._create_photoset(photoId)
+            # first photo shouldn't be added to photoset as Flickrs does it for us
+            firstPhoto = True
+
         # add the photo to the photoset
-        if self.photoSetId:
+        if self.photoSetId and not firstPhoto:
             ret = self.fapi.photosets_addPhoto(
                                 photoset_id = self.photoSetId,
                                 photo_id = photoId)