? =
? attachment.cgi?id=61108
? attachment.cgi?id=61108.1
? attachment.cgi?id=61476
? attachment.cgi?id=61476.1
? attachment.cgi?id=61539
? attachment.cgi?id=61735
? attachment.cgi?id=62718
? attachment.cgi?id=62822
? attachment.cgi?id=62964
? b
? bug-23368-integrated-ripping.diff
? burner.Diff
? burner.diff
? burner.diuff
? conf11657.file
? detect.diff
? interdiff.diff
? ipod-plugins.diff
? ipod-todo.txt
? ipod-write.diff
? malloc-overflows.diff
? move-to-trash.didd
? move-to-trash.diff
? patch.diff
? playbin.diff
? playlist.diff
? queue-set.diff
? rb-ipod-source-libgpod.diff
? rb-ipod-source.c
? rb-recorder-gst.diff
? rhythmbox-audioscrobbler-libsoup-new-files.tar.bz2
? rhythmbox-gpod.diff
? show_bug.cgi?id=338443
? treeview.diff
? data/ui/ipod-ui.xml
? plugins/ipod
? remote/dbus/rb-remote-dbus.loT
? sources/rb-audioscrobbler.c
? sources/rb-library-source.diff
Index: sources/rb-ipod-source.c
===================================================================
RCS file: /cvs/gnome/rhythmbox/sources/rb-ipod-source.c,v
retrieving revision 1.36
diff -u -r1.36 rb-ipod-source.c
--- sources/rb-ipod-source.c	31 Mar 2006 03:14:58 -0000	1.36
+++ sources/rb-ipod-source.c	15 Apr 2006 09:49:34 -0000
@@ -462,6 +462,23 @@
 	return result;
 }
 
+static gboolean
+rb_ipod_volume_has_ipod_db (GnomeVFSVolume *volume)
+{
+	char *itunesdb_path;
+	gboolean result;
+
+	itunesdb_path = rb_ipod_get_itunesdb_path (volume);
+	if (itunesdb_path != NULL) {
+		result = g_file_test (itunesdb_path, G_FILE_TEST_EXISTS);
+	} else {
+		result = FALSE;
+	}
+	g_free (itunesdb_path);
+
+	return result;
+}
+
 gboolean
 rb_ipod_is_volume_ipod (GnomeVFSVolume *volume)
 {
@@ -481,17 +498,13 @@
 
 		result = hal_udi_is_ipod (udi);
 		g_free (udi);
-		return result;
+		if (result == FALSE) {
+			return FALSE;
+		}
 	}
 #endif
 	
-	itunesdb_path = rb_ipod_get_itunesdb_path (volume);
-	if (itunesdb_path != NULL) {
-		result = g_file_test (itunesdb_path, G_FILE_TEST_EXISTS);
-		g_free (itunesdb_path);
-	}
-
-	return result;
+	return rb_ipod_volume_has_ipod_db (volume);
 }
 
 #ifdef HAVE_HAL_0_5
