conduit r1410 - in trunk: . conduit/modules/iPodModule
- From: jstowers svn gnome org
- To: svn-commits-list gnome org
- Subject: conduit r1410 - in trunk: . conduit/modules/iPodModule
- Date: Fri, 4 Apr 2008 13:40:25 +0100 (BST)
Author: jstowers
Date: Fri Apr 4 13:40:24 2008
New Revision: 1410
URL: http://svn.gnome.org/viewvc/conduit?rev=1410&view=rev
Log:
2008-04-05 John Stowers <john stowers gmail com>
* conduit/modules/iPodModule/iPodModule.py: Make iPod names consistant
and check that ipods support photos before adding the photo dataprovider
Modified:
trunk/ChangeLog
trunk/conduit/modules/iPodModule/iPodModule.py
Modified: trunk/conduit/modules/iPodModule/iPodModule.py
==============================================================================
--- trunk/conduit/modules/iPodModule/iPodModule.py (original)
+++ trunk/conduit/modules/iPodModule/iPodModule.py Fri Apr 4 13:40:24 2008
@@ -66,9 +66,16 @@
def get_dataproviders(self, udi, **kwargs):
if LIBGPOD_PHOTOS:
- return [IPodNoteTwoWay, IPodContactsTwoWay, IPodCalendarTwoWay, IPodPhotoSink]
- else:
- return [IPodNoteTwoWay, IPodContactsTwoWay, IPodCalendarTwoWay]
+ #Read information about the ipod, like if it supports
+ #photos or not
+ d = gpod.itdb_device_new()
+ gpod.itdb_device_set_mountpoint(d,kwargs['mount'])
+ supportsPhotos = gpod.itdb_device_supports_photo(d)
+ gpod.itdb_device_free(d)
+ if supportsPhotos:
+ return [IPodNoteTwoWay, IPodContactsTwoWay, IPodCalendarTwoWay, IPodPhotoSink]
+
+ return [IPodNoteTwoWay, IPodContactsTwoWay, IPodCalendarTwoWay]
class IPodBase(DataProvider.TwoWay):
@@ -137,7 +144,7 @@
LUID is the note title
"""
- _name_ = "iPod Notes"
+ _name_ = "Notes"
_description_ = "Sync your iPod notes"
_module_type_ = "twoway"
_in_type_ = "note"
@@ -243,7 +250,7 @@
class IPodContactsTwoWay(IPodBase):
- _name_ = "iPod Contacts"
+ _name_ = "Contacts"
_description_ = "Sync your iPod contacts"
_module_type_ = "twoway"
_in_type_ = "contact"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]