r11684 - in /desktop/unstable/gnome-vfs2/debian: changelog patches/23_improve_volume_labels.patch patches/series

[otavio at users.alioth.debian.org]

Author: otavio
Date: Tue Jun 26 01:52:35 2007
New Revision: 11684

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11684
Log:
* 23_improve_volume_labels.patch: Improve volume labels. Thanks to
  Luis Gustavo S. Barreto <gustavo at ossystems.com.br> for the patch.

Added:
    desktop/unstable/gnome-vfs2/debian/patches/23_improve_volume_labels.patch
Modified:
    desktop/unstable/gnome-vfs2/debian/changelog
    desktop/unstable/gnome-vfs2/debian/patches/series

Modified: desktop/unstable/gnome-vfs2/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs2/debian/changelog?rev=11684&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs2/debian/changelog (original)
+++ desktop/unstable/gnome-vfs2/debian/changelog Tue Jun 26 01:52:35 2007
@@ -1,10 +1,15 @@
 gnome-vfs2 (1:2.18.1-3) UNRELEASED; urgency=low
 
+  [ Josselin Mouette ]
   * libgnomevfs2-common.preinst, libgnomevfs2-extra.preinst: use
     dpkg-query instead of parsing the status file directly.
   * 99_ltmain_as-needed.patch: get --as-needed back to work.
 
- -- Josselin Mouette <joss at debian.org>  Thu, 07 Jun 2007 00:03:09 +0200
+  [ Otavio Salvador ]
+  * 23_improve_volume_labels.patch: Improve volume labels. Thanks to
+    Luis Gustavo S. Barreto <gustavo at ossystems.com.br> for the patch.
+
+ -- Otavio Salvador <otavio at ossystems.com.br>  Mon, 25 Jun 2007 13:45:34 -0300
 
 gnome-vfs2 (1:2.18.1-2) unstable; urgency=low
 

Added: desktop/unstable/gnome-vfs2/debian/patches/23_improve_volume_labels.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs2/debian/patches/23_improve_volume_labels.patch?rev=11684&op=file
==============================================================================
--- desktop/unstable/gnome-vfs2/debian/patches/23_improve_volume_labels.patch (added)
+++ desktop/unstable/gnome-vfs2/debian/patches/23_improve_volume_labels.patch Tue Jun 26 01:52:35 2007
@@ -1,0 +1,58 @@
+Index: gnome-vfs2-2.18.1/libgnomevfs/gnome-vfs-hal-mounts.c
+===================================================================
+--- gnome-vfs2-2.18.1.orig/libgnomevfs/gnome-vfs-hal-mounts.c	2007-06-25 22:46:57.000000000 -0300
++++ gnome-vfs2-2.18.1/libgnomevfs/gnome-vfs-hal-mounts.c	2007-06-25 22:47:30.000000000 -0300
+@@ -328,6 +328,7 @@
+ 	LibHalDriveType drive_type;
+ 	char *name;
+ 	char *vm_name;
++	char *mountpoint;
+ 	gboolean may_prepend_external;
+ 
+ 
+@@ -350,6 +351,16 @@
+ 			goto out;
+ 		}
+ 
++		/* use mount point if available */
++		mountpoint = libhal_volume_get_mount_point (hal_volume);
++		if (mountpoint != NULL && strlen (mountpoint) > 0) {
++			/* chop off /media prefix */
++			if (!strncmp (mountpoint, "/media/", 7) && strlen (mountpoint) > 7)
++				mountpoint += 7;
++			name = g_strdup_printf ("%s", mountpoint);
++			goto out;
++		}
++
+ 		/* Otherwise, just use volume size */
+ 
+ 		size_str = gnome_vfs_format_file_size_for_display (libhal_volume_get_size (hal_volume));
+@@ -486,6 +497,7 @@
+ 	const char *volume_label;
+ 	char *name;
+ 	char *size_str;
++	char *mountpoint;
+ 
+ 	name = NULL;
+ 
+@@ -573,8 +585,19 @@
+ 		goto out;
+ 	}
+ 
+-	/* Fallback: size of media */
++	/* mount point, when it's not removable */
++	if (!libhal_drive_uses_removable_media (hal_drive)) {
++		mountpoint = libhal_volume_get_mount_point (hal_volume);
++		if (mountpoint != NULL && strlen (mountpoint) > 0) {
++		    /* chop off /media prefix */
++		    if (!strncmp (mountpoint, "/media/", 7) && strlen (mountpoint) > 7)
++		       mountpoint += 7;
++		    name = g_strdup_printf ("%s", mountpoint);
++		    goto out;
++		}
++	}
+ 
++	/* Fallback: size of media */
+ 	size_str = gnome_vfs_format_file_size_for_display (libhal_volume_get_size (hal_volume));
+ 	if (size_str != NULL) {
+ 		if (libhal_drive_uses_removable_media (hal_drive)) {

Modified: desktop/unstable/gnome-vfs2/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs2/debian/patches/series?rev=11684&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs2/debian/patches/series (original)
+++ desktop/unstable/gnome-vfs2/debian/patches/series Tue Jun 26 01:52:35 2007
@@ -12,5 +12,6 @@
 19_hurd_path_max.patch
 20_dont_register_keys_for_gaim.patch
 22_ignore_inaccessible_volumes.patch
+23_improve_volume_labels.patch
 30_nfs4.patch
 99_ltmain_as-needed.patch