gnome-panel freeze break - multiple icons for audio cd

[Vincent Untz <vuntz gnome org>]

Le mercredi 11 mars 2009, à 10:34 +0100, Alexander Larsson a écrit :
> In this release we introduced the concept of "shadowed" mounts. A mount
> is shadowed when some other UI element more or less "takes over" it
> UI-wise. For instance, When the hal volume monitor detects a cd drive
> with an audio cd in it it generates a mount object that shadows the
> "real" gvfs audio cd mount, so that the mount appears as being in the cd
> drive volume (otherwise hard since these are different types of mounts).
> 
> Most code is updated to not show shadowed mounts, however it seems we
> forgot to handle this in computer://.
> 
> Bug: http://bugzilla.gnome.org/show_bug.cgi?id=572521
> Patch: http://bugzilla.gnome.org/attachment.cgi?id=130448&action=view
> 
> Can i commit this?

And here's the patch for gnome-panel to do the same thing.
Is it okay to commit?

Vincent

-- 
Les gens heureux ne sont pas pressés.

Index: panel-menu-items.c
===================================================================
--- panel-menu-items.c	(révision 11553)
+++ panel-menu-items.c	(copie de travail)
@@ -831,6 +831,11 @@ panel_place_menu_item_append_local_gio (
 
 		mount = l->data;
 
+		if (g_mount_is_shadowed (mount)) {
+			g_object_unref (mount);
+			continue;
+		}
+
 		volume = g_mount_get_volume (mount);
 		if (volume != NULL) {
 			g_object_unref (volume);
@@ -917,6 +922,12 @@ panel_place_menu_item_append_remote_gio
 		GFile   *root;
 
 		mount = l->data;
+
+		if (g_mount_is_shadowed (mount)) {
+			g_object_unref (mount);
+			continue;
+		}
+
 		volume = g_mount_get_volume (mount);
 		if (volume != NULL) {
 			g_object_unref (volume);