[maemo-commits] [maemo-commits] r11709 - in projects/haf/trunk/gnome-vfs-filechooser-backend: . debian src

[From: subversion at stage.maemo.org]

Author: richard
Date: 2007-05-18 17:20:24 +0300 (Fri, 18 May 2007)
New Revision: 11709

Modified:
   projects/haf/trunk/gnome-vfs-filechooser-backend/ChangeLog
   projects/haf/trunk/gnome-vfs-filechooser-backend/configure.ac
   projects/haf/trunk/gnome-vfs-filechooser-backend/debian/changelog
   projects/haf/trunk/gnome-vfs-filechooser-backend/src/gtkfilesystemgnomevfs.c
Log:
Prepare for release.

Modified: projects/haf/trunk/gnome-vfs-filechooser-backend/ChangeLog
===================================================================
--- projects/haf/trunk/gnome-vfs-filechooser-backend/ChangeLog	2007-05-18 13:36:50 UTC (rev 11708)
+++ projects/haf/trunk/gnome-vfs-filechooser-backend/ChangeLog	2007-05-18 14:20:24 UTC (rev 11709)
@@ -0,0 +1,18 @@
+2007-05-18  Richard Hult  <richard at imendio.com>
+
+	* Release 1.9.2.
+
+2007-05-18  Richard Hult  <richard at imendio.com>
+
+	* src/gtkfilesystemgnomevfs.c:
+	(gtk_file_system_gnome_vfs_list_volumes),
+	(gtk_file_system_gnome_vfs_volume_get_is_mounted):
+	- Work around detection of unmounted volumes, see GNOME bug
+	#439422.
+	- Fix memory bug, see GNOME bug #439420.
+
+2007-05-18  Richard Hult  <richard at imendio.com>
+
+	* configure.ac: Bump version
+
+

Modified: projects/haf/trunk/gnome-vfs-filechooser-backend/configure.ac
===================================================================
--- projects/haf/trunk/gnome-vfs-filechooser-backend/configure.ac	2007-05-18 13:36:50 UTC (rev 11708)
+++ projects/haf/trunk/gnome-vfs-filechooser-backend/configure.ac	2007-05-18 14:20:24 UTC (rev 11709)
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.52)
  
-AC_INIT(gnome-vfs-filechooser-backend, 1.9.0)
+AC_INIT(gnome-vfs-filechooser-backend, 1.9.2)
 AC_CONFIG_SRCDIR(src/gtkfilesystemgnomevfs.c)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 

Modified: projects/haf/trunk/gnome-vfs-filechooser-backend/debian/changelog
===================================================================
--- projects/haf/trunk/gnome-vfs-filechooser-backend/debian/changelog	2007-05-18 13:36:50 UTC (rev 11708)
+++ projects/haf/trunk/gnome-vfs-filechooser-backend/debian/changelog	2007-05-18 14:20:24 UTC (rev 11709)
@@ -1,6 +1,12 @@
+gnome-vfs-filechooser-backend (1.9.2-1) unstable; urgency=low
+
+  * Work around detection of unmounted volumes, see GNOME bug #439422
+  * Fix memory bug, see GNOME bug #439420
+
+ -- Richard Hult <richard at imendio.com>  Fri,  2 Mar 2007 08:48:15 +0100
+
 gnome-vfs-filechooser-backend (1.9.1-2) unstable; urgency=low
 
-  * UNRELEASED
   * Add cdbs build dependency
 
  -- Richard Hult <richard at imendio.com>  Fri,  2 Mar 2007 08:48:15 +0100

Modified: projects/haf/trunk/gnome-vfs-filechooser-backend/src/gtkfilesystemgnomevfs.c
===================================================================
--- projects/haf/trunk/gnome-vfs-filechooser-backend/src/gtkfilesystemgnomevfs.c	2007-05-18 13:36:50 UTC (rev 11708)
+++ projects/haf/trunk/gnome-vfs-filechooser-backend/src/gtkfilesystemgnomevfs.c	2007-05-18 14:20:24 UTC (rev 11709)
@@ -687,15 +687,12 @@
       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);
-	}
+        result = g_slist_prepend (result, volume);
       else
-	{
-	  gnome_vfs_drive_unref (drive);
-	  gnome_vfs_volume_unref (volume);
-	}
+        gnome_vfs_volume_unref (volume);
+
+      if (drive)
+        gnome_vfs_drive_unref (drive);
     }
 
   g_list_free (list);
@@ -1780,7 +1777,21 @@
   if (IS_NETWORK_SERVERS_VOLUME_TOKEN (volume))
     return TRUE;
   else if (GNOME_IS_VFS_DRIVE (volume))
-    return gnome_vfs_drive_is_mounted (GNOME_VFS_DRIVE (volume));
+    {
+      GList *volumes, *l;
+      gboolean mounted = FALSE;
+
+      volumes = gnome_vfs_drive_get_mounted_volumes (GNOME_VFS_DRIVE (volume));
+      for (l = volumes; l; l = l->next)
+        {
+          if (gnome_vfs_volume_is_mounted (l->data))
+            mounted = TRUE;
+          gnome_vfs_volume_unref (l->data);
+        }
+      g_list_free (volumes);
+
+      return mounted;
+    }
   else if (GNOME_IS_VFS_VOLUME (volume))
     return gnome_vfs_volume_is_mounted (GNOME_VFS_VOLUME (volume));
   else