gvfs r2304 - in trunk: . monitor/gphoto2

[alexl svn gnome org]

Author: alexl
Date: Mon Mar  9 13:33:27 2009
New Revision: 2304
URL: http://svn.gnome.org/viewvc/gvfs?rev=2304&view=rev

Log:
2009-03-09  Alexander Larsson  <alexl redhat com>

	Bug 570888 â gvfs-gphoto2 mount 4 devices when pluging one camera

        * monitor/gphoto2/ggphoto2volumemonitor.c:
        (get_stores_for_camera):
	Ignore stores that have 0 byte capability.




Modified:
   trunk/ChangeLog
   trunk/monitor/gphoto2/ggphoto2volumemonitor.c

Modified: trunk/monitor/gphoto2/ggphoto2volumemonitor.c
==============================================================================
--- trunk/monitor/gphoto2/ggphoto2volumemonitor.c	(original)
+++ trunk/monitor/gphoto2/ggphoto2volumemonitor.c	Mon Mar  9 13:33:27 2009
@@ -451,7 +451,13 @@
 
   /* Append the data to the list */
   for (i = 0; i < num_storage_info; i++)
-    l = g_list_prepend (l, g_strdup (storage_info[i].basedir));
+    {
+      /* Ignore storage with no capacity (see bug 570888) */
+      if ((storage_info[i].fields & GP_STORAGEINFO_MAXCAPACITY) &&
+          storage_info[i].capacitykbytes == 0)
+        continue;
+      l = g_list_prepend (l, g_strdup (storage_info[i].basedir));
+    }
 
 out:
   /* Clean up */