rhythmbox r6033 - in trunk: . plugins/mtpdevice

[jmatthew svn gnome org]

Author: jmatthew
Date: Mon Nov 10 04:52:27 2008
New Revision: 6033
URL: http://svn.gnome.org/viewvc/rhythmbox?rev=6033&view=rev

Log:
2008-11-10  Jonathan Matthew  <jonathan d14n org>

	patch more or less by: Flavio Martins  <xhaker gmail com>

	* plugins/mtpdevice/rb-mtp-source.c: (rb_mtp_source_load_tracks):
	Ignore some broken device names.  Fixes #478715.


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	Mon Nov 10 04:52:27 2008
@@ -460,7 +460,9 @@
 
 	if ((priv->device != NULL) && (priv->entry_map != NULL)) {
 		name = LIBMTP_Get_Friendlyname (priv->device);
-		if (name == NULL) {
+		/* ignore some particular broken device names */
+		if (name == NULL || strcmp (name, "?????") == 0) {
+			g_free (name);
 			name = LIBMTP_Get_Modelname (priv->device);
 		}
 		if (name == NULL) {