conduit r1253 - in trunk: . conduit/modules/FileModule conduit/modules/FlickrModule conduit/modules/GoogleModule/libgdata

[jstowers svn gnome org]

Author: jstowers
Date: Sun Jan 20 06:45:29 2008
New Revision: 1253
URL: http://svn.gnome.org/viewvc/conduit?rev=1253&view=rev

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

	* conduit/modules/FileModule/FileConfiguration.py:
	* conduit/modules/FileModule/FileModule.py: Use set/get_current_folder_uri
	in the folderchooser. Fixes bug #510523

	* conduit/modules/FlickrModule/FlickrModule.py: Typo

	* conduit/modules/GoogleModule/libgdata/Makefile.am: Oops, rm directory

2008-01-20  John Stowers  <john stowers gmail com>

	* conduit/modules/GoogleModule/GoogleModule.py:
	* conduit/modules/GoogleModule/Makefile.am:
	* conduit/modules/GoogleModule/atom/Makefile.am:
	* conduit/modules/GoogleModule/gdata/Makefile.am:
	* conduit/modules/GoogleModule/gdata/calendar/Makefile.am:
	* conduit/modules/GoogleModule/gdata/exif/Makefile.am:
	* conduit/modules/GoogleModule/gdata/geo/Makefile.am:
	* conduit/modules/GoogleModule/gdata/media/Makefile.am:
	* conduit/modules/GoogleModule/gdata/photos/Makefile.am:
	* conduit/modules/GoogleModule/libgdata/atom/Makefile.am:
	* conduit/modules/GoogleModule/libgdata/atom/__init__.py:
	* conduit/modules/GoogleModule/libgdata/atom/service.py:
	* conduit/modules/GoogleModule/libgdata/gdata/Makefile.am:
	* conduit/modules/GoogleModule/libgdata/gdata/__init__.py:
	* conduit/modules/GoogleModule/libgdata/gdata/auth.py:
	* conduit/modules/GoogleModule/libgdata/gdata/calendar/Makefile.am:
	* conduit/modules/GoogleModule/libgdata/gdata/calendar/__init__.py:
	* conduit/modules/GoogleModule/libgdata/gdata/calendar/service.py:
	* conduit/modules/GoogleModule/libgdata/gdata/exif/Makefile.am:
	* conduit/modules/GoogleModule/libgdata/gdata/exif/__init__.py:
	* conduit/modules/GoogleModule/libgdata/gdata/geo/Makefile.am:
	* conduit/modules/GoogleModule/libgdata/gdata/geo/__init__.py:
	* conduit/modules/GoogleModule/libgdata/gdata/media/Makefile.am:
	* conduit/modules/GoogleModule/libgdata/gdata/media/__init__.py:
	* conduit/modules/GoogleModule/libgdata/gdata/photos/Makefile.am:
	* conduit/modules/GoogleModule/libgdata/gdata/photos/__init__.py:
	* conduit/modules/GoogleModule/libgdata/gdata/photos/service.py:
	* conduit/modules/GoogleModule/libgdata/gdata/service.py:
	* configure.ac: Move libgdata -> gdata to be consistent with other modules
	and because it seems to be the easiest way to accomodate the case where
	the user has gdata installed, but an older version without photo support



Removed:
   trunk/conduit/modules/GoogleModule/libgdata/
Modified:
   trunk/ChangeLog
   trunk/conduit/modules/FileModule/FileConfiguration.py
   trunk/conduit/modules/FileModule/FileModule.py
   trunk/conduit/modules/FlickrModule/FlickrModule.py

Modified: trunk/conduit/modules/FileModule/FileConfiguration.py
==============================================================================
--- trunk/conduit/modules/FileModule/FileConfiguration.py	(original)
+++ trunk/conduit/modules/FileModule/FileConfiguration.py	Sun Jan 20 06:45:29 2008
@@ -312,7 +312,7 @@
 						"FolderTwoWayConfigDialog"
 						)
         self.folderChooser = tree.get_widget("filechooserbutton1")
-        self.folderChooser.set_uri(self.folder)
+        self.folderChooser.set_current_folder_uri(self.folder)
         self.folderEntry = tree.get_widget("entry1")
         self.folderEntry.set_text(self.folderGroupName)
         self.hiddenCb = tree.get_widget("hidden")
@@ -341,8 +341,9 @@
                 dialog.emit_stop_by_name("response")
             else:
                 self.folderGroupName = self.folderEntry.get_text()
-                uri = self.folderChooser.get_uri()
-                self.folder = Vfs.uri_make_canonical(uri)
+                self.folder = Vfs.uri_make_canonical(
+                                    self.folderChooser.get_current_folder_uri()
+                                    )
                 self.includeHidden = self.hiddenCb.get_active()
                 self.compareIgnoreMtime = self.mtimeCb.get_active()
 

Modified: trunk/conduit/modules/FileModule/FileModule.py
==============================================================================
--- trunk/conduit/modules/FileModule/FileModule.py	(original)
+++ trunk/conduit/modules/FileModule/FileModule.py	Sun Jan 20 06:45:29 2008
@@ -60,7 +60,7 @@
     _name_ = _("Folder")
     _description_ = _("Synchronize folders")
 
-    DEFAULT_FOLDER = os.path.expanduser("~")
+    DEFAULT_FOLDER = "file://"+os.path.expanduser("~")
     DEFAULT_GROUP = "Home"
     DEFAULT_HIDDEN = False
     DEFAULT_COMPARE_IGNORE_MTIME = False

Modified: trunk/conduit/modules/FlickrModule/FlickrModule.py
==============================================================================
--- trunk/conduit/modules/FlickrModule/FlickrModule.py	(original)
+++ trunk/conduit/modules/FlickrModule/FlickrModule.py	Sun Jan 20 06:45:29 2008
@@ -19,7 +19,7 @@
 
 #We have to use our own flickrapi until the following is applied
 #http://sourceforge.net/tracker/index.php?func=detail&aid=1874067&group_id=203043&atid=984009
-Utils.dataprovider_add_dir_to_path(__file__, "")
+Utils.dataprovider_add_dir_to_path(__file__)
 import flickrapi
 if not flickrapi.__version__.endswith("CONDUIT"):
     raise Exceptions.NotSupportedError("Incorrect Flickrapi version")