rhythmbox r5917 - in trunk: . plugins/mtpdevice

[jmatthew svn gnome org]

Author: jmatthew
Date: Sat Sep 13 23:40:23 2008
New Revision: 5917
URL: http://svn.gnome.org/viewvc/rhythmbox?rev=5917&view=rev

Log:
2008-09-14  Jonathan Matthew  <jonathan d14n org>

	patch by:  Eric Shattow  <lucent+code gmail com>

	* plugins/mtpdevice/rb-mtp-source.c: (load_mtp_db_idle_cb):
	Call LIBMTP_Get_Tracklisting_With_Callback to stop libmtp 0.3.0+
	complaining.  Fixes #552108.


Modified:
   trunk/ChangeLog
   trunk/plugins/mtpdevice/rb-mtp-source.c

Modified: trunk/plugins/mtpdevice/rb-mtp-source.c
==============================================================================
--- trunk/plugins/mtpdevice/rb-mtp-source.c	(original)
+++ trunk/plugins/mtpdevice/rb-mtp-source.c	Sat Sep 13 23:40:23 2008
@@ -375,7 +375,11 @@
 
 	g_assert (db != NULL);
 
+#ifdef HAVE_LIBMTP_030
+	tracks = LIBMTP_Get_Tracklisting_With_Callback (priv->device, NULL, NULL);
+#else
 	tracks = LIBMTP_Get_Tracklisting (priv->device);
+#endif
 	if (tracks != NULL) {
 		LIBMTP_track_t *track, *tmp = NULL;
 		for (track = tracks; track != NULL; track = track->next) {