File libgnomeui-155010-filechooser-show-drives.diff of Package libgnomeui

Overview Repositories Revisions Requests Users Attributes Meta

File libgnomeui-155010-filechooser-show-drives.diff of Package libgnomeui (Revision b22710f56fe01af97dd6ebc4a1de4dda)

Currently displaying revision b22710f56fe01af97dd6ebc4a1de4dda , Show latest

2006-03-31  Federico Mena Quintero  <federico@novell.com>

* file-chooser/gtkfilesystemgnomevfs.c
	(gtk_file_system_gnome_vfs_list_volumes): List only
	user-visible unmounted drives, not all drives.  Conversely,
	list *all* mounted volumes, not just the ones that don't have
	a corresponding drive.  Fixes the libgnomeui part of bug
	http://bugzilla.gnome.org/show_bug.cgi?id=321320

--- libgnomeui-2.12.0.orig/file-chooser/gtkfilesystemgnomevfs.c	2006-04-03 14:05:57.000000000 -0500
+++ libgnomeui-2.12.0/file-chooser/gtkfilesystemgnomevfs.c	2006-04-03 14:07:49.000000000 -0500
@@ -522,14 +522,15 @@ gtk_file_system_gnome_vfs_list_volumes (
 
   result = NULL;
 
-  /* User-visible drives */
+  /* User-visible drives which don't have mounted volumes*/
 
   list = gnome_vfs_volume_monitor_get_connected_drives (system_vfs->volume_monitor);
   for (l = list; l; l = l->next)
     {
       drive = GNOME_VFS_DRIVE (l->data);
 
-      if (gnome_vfs_drive_is_user_visible (drive))
+      if (gnome_vfs_drive_is_user_visible (drive)
+	  && !gnome_vfs_drive_is_mounted (drive))
 	result = g_slist_prepend (result, drive);
       else
 	gnome_vfs_drive_unref (drive);
@@ -537,24 +538,17 @@ gtk_file_system_gnome_vfs_list_volumes (
 
   g_list_free (list);
 
-  /* User-visible volumes with no corresponding drives */
+  /* User-visible volumes */
 
   list = gnome_vfs_volume_monitor_get_mounted_volumes (system_vfs->volume_monitor);
   for (l = list; l; l = l->next)
     {
       volume = GNOME_VFS_VOLUME (l->data);
-      drive = gnome_vfs_volume_get_drive (volume);
 
-      if (!drive && gnome_vfs_volume_is_user_visible (volume))
-	{
-	  gnome_vfs_drive_unref (drive);
-	  result = g_slist_prepend (result, volume);
-	}
+      if (gnome_vfs_volume_is_user_visible (volume))
+	result = g_slist_prepend (result, volume);
       else
-	{
-	  gnome_vfs_drive_unref (drive);
 	  gnome_vfs_volume_unref (volume);
-	}
     }
 
   g_list_free (list);

Places

File libgnomeui-155010-filechooser-show-drives.diff of Package libgnomeui (Revision b22710f56fe01af97dd6ebc4a1de4dda)

Places