Revision: 2019
http://gtkpod.svn.sourceforge.net/gtkpod/?rev=2019&view=rev
Author: jcsjcs
Date: 2008-06-28 01:01:29 -0700 (Sat, 28 Jun 2008)
Log Message:
-----------
* src/file_itunesdb.c
src/display_photo.c
src/display_photo.h: don't display error message about
non-available photodb if iPod does not support photos.
Modified Paths:
--------------
gtkpod/trunk/ChangeLog
gtkpod/trunk/src/display_photo.c
gtkpod/trunk/src/display_photo.h
gtkpod/trunk/src/file_itunesdb.c
Modified: gtkpod/trunk/ChangeLog
===================================================================
--- gtkpod/trunk/ChangeLog 2008-06-24 18:39:38 UTC (rev 2018)
+++ gtkpod/trunk/ChangeLog 2008-06-28 08:01:29 UTC (rev 2019)
@@ -1,3 +1,10 @@
+2008-06-28 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+ * src/file_itunesdb.c
+ src/display_photo.c
+ src/display_photo.h: don't display error message about
+ non-available photodb if iPod does not support photos.
+
2008-05-31 Todd Zullinger <tmzullinger at users.sourceforge.net>
* po/POTFILES.in: update file list to keep distcheck happy
Modified: gtkpod/trunk/src/display_photo.c
===================================================================
--- gtkpod/trunk/src/display_photo.c 2008-06-24 18:39:38 UTC (rev 2018)
+++ gtkpod/trunk/src/display_photo.c 2008-06-28 08:01:29 UTC (rev 2019)
@@ -148,6 +148,8 @@
db = itdb_photodb_parse (mp, &error);
if (db == NULL)
{
+ if (itdb_device_supports_photo (itdb->device))
+ {
if (error)
{
gtkpod_warning (_("Error reading iPod photo database
(%s).\n"), error->message);
@@ -158,7 +160,8 @@
gtkpod_warning (_("Error reading iPod photo
database.\n"));
}
eitdb->photodb = NULL;
- return;
+ }
+ return;
}
/* Set the reference to the photo database */
@@ -169,24 +172,6 @@
}
/**
- * gphoto_ipod_supports_photos
- *
- * Convenience function that passes onto libgpod and requests
- * whether the ipod has photo support
- *
- * Returns:
- * true/false whether the ipod has photo support
- */
-gboolean gphoto_ipod_supports_photos(iTunesDB *itdb)
-{
- g_return_val_if_fail (itdb, FALSE);
-
- gboolean status = itdb_device_supports_photo (itdb->device);
-
- return status;
-}
-
-/**
* gphoto_is_photo_playlist
*
* Convenience function that determines whether the
Modified: gtkpod/trunk/src/display_photo.h
===================================================================
--- gtkpod/trunk/src/display_photo.h 2008-06-24 18:39:38 UTC (rev 2018)
+++ gtkpod/trunk/src/display_photo.h 2008-06-28 08:01:29 UTC (rev 2019)
@@ -54,7 +54,6 @@
#define GPHOTO_PREVIEW 2
void gphoto_load_photodb (iTunesDB *itdb);
-gboolean gphoto_ipod_supports_photos (iTunesDB *itdb);
gboolean gphoto_is_photo_playlist (Playlist *pl);
void gphoto_display_photo_window (iTunesDB *itdb);
void gphoto_change_to_photo_window (gboolean showflag);
Modified: gtkpod/trunk/src/file_itunesdb.c
===================================================================
--- gtkpod/trunk/src/file_itunesdb.c 2008-06-24 18:39:38 UTC (rev 2018)
+++ gtkpod/trunk/src/file_itunesdb.c 2008-06-28 08:01:29 UTC (rev 2019)
@@ -2048,7 +2048,7 @@
*/
if (success &&
(itdb->usertype & GP_ITDB_TYPE_IPOD) &&
- gphoto_ipod_supports_photos (itdb) &&
+ itdb_device_supports_photo (itdb->device) &&
eitdb->photodb != NULL &&
eitdb->photo_data_changed == TRUE)
{
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
