[conduit/gsoc09_alexandre: 6/6] Merge branch 'master' into gsoc09_alexandre

[Alexandre Rosenfeld <arosenfeld src gnome org>]

commit c0ca99bef5d7539572359ef411cacc87dd64b71f
Merge: 2684321... be13981...
Author: Alexandre Rosenfeld <airmind gmail com>
Date:   Sat Jun 27 19:16:33 2009 -0300

    Merge branch 'master' into gsoc09_alexandre

 NEWS                                               |   60 +++
 conduit/Vfs.py                                     |    4 +-
 conduit/__init__.py                                |    2 +-
 conduit/datatypes/File.py                          |   10 +-
 conduit/defs.py.in                                 |    2 +-
 conduit/gtkui/UI.py                                |    4 -
 conduit/modules/FlickrModule/flickrapi/__init__.py |    5 +-
 .../GoogleModule/gdata/tlslite/utils/cryptomath.py |    5 +-
 conduit/modules/iPodModule/iPodModule.py           |    2 +-
 conduit/platform/FileGnomeVfs.py                   |  409 --------------------
 conduit/platform/Makefile.am                       |    1 -
 configure.ac                                       |    8 +-
 scripts/maintainer.py                              |    4 +-
 test/python-tests/TestCoreFile.py                  |    2 +-
 test/python-tests/TestCoreVfs.py                   |    2 +-
 test/python-tests/common.py                        |    5 -
 16 files changed, 81 insertions(+), 444 deletions(-)
---
diff --cc conduit/modules/iPodModule/iPodModule.py
index 43cec19,2c66f39..9acaf12
--- a/conduit/modules/iPodModule/iPodModule.py
+++ b/conduit/modules/iPodModule/iPodModule.py
@@@ -64,9 -63,51 +64,9 @@@ def _string_to_unqiue_file(txt, base_ur
      temp = Utils.new_tempfile(txt)
      uri = os.path.join(base_uri, prefix+temp.get_filename()+postfix)
      temp.transfer(uri, True)
-     temp.set_UID(uri)
+     temp.set_UID(os.path.basename(uri))
      return temp.get_rid()
  
 -class iPodFactory(VolumeFactory.VolumeFactory):
 -
 -    def _get_mount_path(self, props):
 -        return str(props["volume.mount_point"])
 -
 -    def is_interesting(self, udi, props):
 -        if props.get("info.parent"):
 -            parent = self._get_properties(props["info.parent"])
 -            if parent.get("storage.model") == "iPod":
 -                props.update(parent)
 -                return True
 -        return False
 -
 -    def get_category(self, udi, **kwargs):
 -        label = kwargs['volume.label']
 -        if not label:
 -            label = "Apple iPod Music Player"
 -        return DataProviderCategory.DataProviderCategory(
 -                    label,
 -                    "multimedia-player-ipod-standard-color",
 -                    self._get_mount_path(kwargs))
 -
 -    def get_dataproviders(self, udi, **kwargs):
 -        #Read information about the ipod, like if it supports
 -        #photos or not
 -        d = gpod.itdb_device_new()
 -        gpod.itdb_device_set_mountpoint(d,self._get_mount_path(kwargs))
 -        supportsPhotos = gpod.itdb_device_supports_photo(d)
 -        gpod.itdb_device_free(d)
 -        if supportsPhotos:
 -            return [IPodMusicTwoWay, IPodVideoTwoWay, IPodNoteTwoWay, IPodContactsTwoWay, IPodCalendarTwoWay, IPodPhotoSink]
 -        else:
 -            log.info("iPod does not report photo support")
 -            return [IPodMusicTwoWay, IPodVideoTwoWay, IPodNoteTwoWay, IPodContactsTwoWay, IPodCalendarTwoWay]
 -
 -    def get_args(self, udi, **kwargs):
 -        """
 -        iPod needs a local path to the DB, not a URI
 -        """
 -        kwargs["mount_path"] = self._get_mount_path(kwargs)
 -        return (kwargs['mount_path'], udi)
 -
  class IPodBase(DataProvider.TwoWay):
      def __init__(self, *args):
          DataProvider.TwoWay.__init__(self)