rhythmbox r5891 - in trunk: . plugins/ipod shell sources

[hadess svn gnome org]

Author: hadess
Date: Sun Sep  7 01:33:35 2008
New Revision: 5891
URL: http://svn.gnome.org/viewvc/rhythmbox?rev=5891&view=rev

Log:
2008-09-07  Bastien Nocera  <hadess hadess net>

	* plugins/ipod/rb-ipod-source.c (rb_ipod_is_mount_ipod):
	* shell/rb-removable-media-manager.c
	(rb_removable_media_manager_add_mount):
	* sources/rb-removable-media-source.c (impl_want_uri):
	Don't print out warnings when a mount doesn't have a corresponding
	volume (Closes: #551178)



Modified:
   trunk/ChangeLog
   trunk/plugins/ipod/rb-ipod-source.c
   trunk/shell/rb-removable-media-manager.c
   trunk/sources/rb-removable-media-source.c

Modified: trunk/plugins/ipod/rb-ipod-source.c
==============================================================================
--- trunk/plugins/ipod/rb-ipod-source.c	(original)
+++ trunk/plugins/ipod/rb-ipod-source.c	Sun Sep  7 01:33:35 2008
@@ -1000,6 +1000,9 @@
 	GVolume *volume;
 
 	volume = g_mount_get_volume (mount);
+	if (volume == NULL)
+		return FALSE;
+
 	udi = g_volume_get_identifier (volume, G_VOLUME_IDENTIFIER_KIND_HAL_UDI);
 	g_object_unref (volume);
 

Modified: trunk/shell/rb-removable-media-manager.c
==============================================================================
--- trunk/shell/rb-removable-media-manager.c	(original)
+++ trunk/shell/rb-removable-media-manager.c	Sun Sep  7 01:33:35 2008
@@ -624,6 +624,10 @@
 	}
 
 	volume = g_mount_get_volume (mount);
+	if (volume == NULL) {
+		rb_debug ("Unhandled media, no volume for mount");
+		return;
+	}
 
 	/* if we've already created a source for the volume,
 	 * don't do anything with the mount.

Modified: trunk/sources/rb-removable-media-source.c
==============================================================================
--- trunk/sources/rb-removable-media-source.c	(original)
+++ trunk/sources/rb-removable-media-source.c	Sun Sep  7 01:33:35 2008
@@ -460,6 +460,9 @@
 		return 0;
 	}
 
+	if (volume == NULL)
+		return 0;
+
 	device_path = g_volume_get_identifier (volume, G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE);
 	g_object_unref (volume);
 	if (device_path == NULL)