rhythmbox r6105 - in trunk: . plugins/mtpdevice

[jmatthew svn gnome org]

Author: jmatthew
Date: Thu Dec 18 03:41:01 2008
New Revision: 6105
URL: http://svn.gnome.org/viewvc/rhythmbox?rev=6105&view=rev

Log:
2008-12-18  Jonathan Matthew  <jonathan d14n org>

	* plugins/mtpdevice/rb-mtp-plugin.c: (rb_mtp_plugin_eject),
	(rb_mtp_plugin_rename):
	Use g_warning instead of g_critical - mtp device actions
	getting called for some other source is weird, but nothing to
	freak out about.

	* plugins/mtpdevice/rb-mtp-source.c: (add_mtp_track_to_db):
	Make the entry location look like a URI, and append the track filename
	so we can use the right extension for track transfers.  Fixes #537356.


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

Modified: trunk/plugins/mtpdevice/rb-mtp-plugin.c
==============================================================================
--- trunk/plugins/mtpdevice/rb-mtp-plugin.c	(original)
+++ trunk/plugins/mtpdevice/rb-mtp-plugin.c	Thu Dec 18 03:41:01 2008
@@ -93,9 +93,6 @@
 static gboolean rb_mtp_plugin_setup_dbus_hal_connection (RBMtpPlugin *plugin);
 
 static RBSource* create_source_cb (RBMtpPlugin *plugin, LIBMTP_mtpdevice_t *device, const char *udi);
-/*static RBSource * create_source_cb (RBRemovableMediaManager *rmm,
-				    GVolume *volume,
-				    RBMtpPlugin *plugin);*/
 static void rb_mtp_plugin_eject  (GtkAction *action, RBMtpPlugin *plugin);
 static void rb_mtp_plugin_rename (GtkAction *action, RBMtpPlugin *plugin);
 
@@ -281,7 +278,7 @@
 		      "selected-source", &source,
 		      NULL);
 	if ((source == NULL) || !RB_IS_MTP_SOURCE (source)) {
-		g_critical ("got MTPSourceEject action for non-mtp source");
+		g_warning ("got MTPSourceEject action for non-mtp source");
 		if (source != NULL)
 			g_object_unref (source);
 		return;
@@ -306,7 +303,7 @@
 		      "selected-source", &source,
 		      NULL);
 	if ((source == NULL) || !RB_IS_MTP_SOURCE (source)) {
-		g_critical ("got MTPSourceEject action for non-mtp source");
+		g_warning ("got MTPSourceEject action for non-mtp source");
 		if (source != NULL)
 			g_object_unref (source);
 		return;

Modified: trunk/plugins/mtpdevice/rb-mtp-source.c
==============================================================================
--- trunk/plugins/mtpdevice/rb-mtp-source.c	(original)
+++ trunk/plugins/mtpdevice/rb-mtp-source.c	Thu Dec 18 03:41:01 2008
@@ -382,7 +382,7 @@
 
 	/* Set URI */
 	g_object_get (G_OBJECT (source), "entry-type", &entry_type, NULL);
-	name = g_strdup_printf ("rb-mtp-%i", track->item_id);
+	name = g_strdup_printf ("x-rb-mtp://%i/%s", track->item_id, track->filename);
 	entry = rhythmdb_entry_new (RHYTHMDB (db), entry_type, name);
 	g_free (name);
         g_boxed_free (RHYTHMDB_TYPE_ENTRY_TYPE, entry_type);