rhythmbox r5741 - in trunk: . plugins/ipod

[teuf svn gnome org]

Author: teuf
Date: Wed Jun 11 21:54:46 2008
New Revision: 5741
URL: http://svn.gnome.org/viewvc/rhythmbox?rev=5741&view=rev

Log:
Patch by Philippe Troin
* plugins/ipod/rb-ipod-db.c: (rb_ipod_db_load): properly detect
shuffles 2g and 3g as ipod shuffles, fixes bug #528301


Modified:
   trunk/ChangeLog
   trunk/plugins/ipod/rb-ipod-db.c

Modified: trunk/plugins/ipod/rb-ipod-db.c
==============================================================================
--- trunk/plugins/ipod/rb-ipod-db.c	(original)
+++ trunk/plugins/ipod/rb-ipod-db.c	Wed Jun 11 21:54:46 2008
@@ -682,7 +682,9 @@
 
 	info = itdb_device_get_ipod_info(priv->itdb->device);
 	if (info->ipod_generation == ITDB_IPOD_GENERATION_UNKNOWN ||
-	    info->ipod_model == ITDB_IPOD_MODEL_SHUFFLE) {
+	    info->ipod_generation == ITDB_IPOD_GENERATION_SHUFFLE_1 ||
+	    info->ipod_generation == ITDB_IPOD_GENERATION_SHUFFLE_2 ||
+	    info->ipod_generation == ITDB_IPOD_GENERATION_SHUFFLE_3) {
 		priv->needs_shuffle_db = TRUE;
 	} else {
 		priv->needs_shuffle_db = FALSE;