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

[otavio at users.alioth.debian.org]

Author: otavio
Date: Mon Jun 25 16:59:17 2007
New Revision: 11681

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11681
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=11681&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs2/debian/changelog (original)
+++ desktop/unstable/gnome-vfs2/debian/changelog Mon Jun 25 16:59:17 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=11681&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 Mon Jun 25 16:59:17 2007
@@ -1,0 +1,50 @@
+diff -Nur gnome-vfs2-2.14.1/libgnomevfs/gnome-vfs-hal-mounts.c gnome-vfs2-2.14.1.new/libgnomevfs/gnome-vfs-hal-mounts.c
+--- gnome-vfs2-2.14.1/libgnomevfs/gnome-vfs-hal-mounts.c	2006-03-27 10:59:07.000000000 +0200
++++ gnome-vfs2-2.14.1.new/libgnomevfs/gnome-vfs-hal-mounts.c	2006-05-12 12:38:55.000000000 +0200
+@@ -342,7 +342,7 @@
+ 
+ 		/* use label if available */
+ 		label = libhal_volume_get_label (hal_volume);
+-		if (label != NULL && strlen (label) > 0) {
++		if (label != NULL && strlen (label) > 0 && strcmp(label, "/")) {
+ 			name = g_strdup (label);
+ 			goto out;
+ 		}
+@@ -483,14 +483,15 @@
+ 	const char *volume_label;
+ 	char *name;
+ 	char *size_str;
++	char *mountpoint;
+ 
+ 	name = NULL;
+ 
+ 	drive_type = libhal_drive_get_type (hal_drive);
+ 	volume_label = libhal_volume_get_label (hal_volume);
+ 
+-	/* Use volume label if available */
+-	if (volume_label != NULL) {
++	/* Use volume label if available, but ignore '/' */
++	if (volume_label != NULL && strlen (volume_label) && strcmp (volume_label, "/")) {
+ 		name = g_strdup (volume_label);
+ 		goto out;
+ 	}
+@@ -570,8 +571,18 @@
+ 		goto out;
+ 	}
+ 
+-	/* Fallback: size of media */
++	
++	/* Fallback: mount point */
++	mountpoint = libhal_volume_get_mount_point (hal_volume);
++	if (mountpoint) {
++	    /* 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=11681&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs2/debian/patches/series (original)
+++ desktop/unstable/gnome-vfs2/debian/patches/series Mon Jun 25 16:59:17 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