[maemo-commits] [maemo-commits] r11838 - in projects/haf/trunk/osso-gnome-vfs2/debian: . patches

[From: subversion at stage.maemo.org]

Author: richard
Date: 2007-05-24 18:38:38 +0300 (Thu, 24 May 2007)
New Revision: 11838

Modified:
   projects/haf/trunk/osso-gnome-vfs2/debian/changelog
   projects/haf/trunk/osso-gnome-vfs2/debian/patches/07-mmc-card-name.patch
Log:
Tweak the way we get volume names.

Modified: projects/haf/trunk/osso-gnome-vfs2/debian/changelog
===================================================================
--- projects/haf/trunk/osso-gnome-vfs2/debian/changelog	2007-05-24 15:30:57 UTC (rev 11837)
+++ projects/haf/trunk/osso-gnome-vfs2/debian/changelog	2007-05-24 15:38:38 UTC (rev 11838)
@@ -2,8 +2,9 @@
 
   * UNRELEASED
   * Fix a daemon crash for "mkdir"
+  * Tweak the way we get volume names
 
- -- Richard Hult <richard at imendio.com>  Wed, 23 May 2007 14:12:45 +0200
+ -- Richard Hult <richard at imendio.com>  Fri, 25 May 2007 14:12:45 +0200
 
 osso-gnome-vfs2 (2.16.3-1osso16) unstable; urgency=low
 
@@ -37,8 +38,6 @@
 
  -- Richard Hult <richard at imendio.com>  Fri, 30 Mar 2007 17:22:17 +0200
 
-
-
 osso-gnome-vfs2 (2.16.3-1osso11) unstable; urgency=low
 
   * Don't package .la files
@@ -56,22 +55,18 @@
 
  -- Richard Hult <richard at imendio.com>  Fri,  9 Mar 2007 09:08:28 +0100
 
-
-
 osso-gnome-vfs2 (2.16.3-1osso9) unstable; urgency=low
 
   * Make a release with samba enabled
 
  -- Richard Hult <richard at imendio.com>  Fri, 16 Feb 2007 16:01:10 +0100
 
-
 osso-gnome-vfs2 (2.16.3-1osso7) unstable; urgency=low
 
   * Really apply the patch for NB#50018
 
  -- Richard Hult <richard at imendio.com>  Fri,  2 Feb 2007 15:41:41 +0100
 
-
 osso-gnome-vfs2 (2.16.3-1osso6) unstable; urgency=low
 
   * Split out samba package into its own binary package

Modified: projects/haf/trunk/osso-gnome-vfs2/debian/patches/07-mmc-card-name.patch
===================================================================
--- projects/haf/trunk/osso-gnome-vfs2/debian/patches/07-mmc-card-name.patch	2007-05-24 15:30:57 UTC (rev 11837)
+++ projects/haf/trunk/osso-gnome-vfs2/debian/patches/07-mmc-card-name.patch	2007-05-24 15:38:38 UTC (rev 11838)
@@ -1,6 +1,6 @@
 Index: libgnomevfs/gnome-vfs-volume-monitor-daemon.c
 ===================================================================
---- libgnomevfs/gnome-vfs-volume-monitor-daemon.c	(revision 11674)
+--- libgnomevfs/gnome-vfs-volume-monitor-daemon.c	(revision 11765)
 +++ libgnomevfs/gnome-vfs-volume-monitor-daemon.c	(arbetskopia)
 @@ -841,6 +841,14 @@ static char *
  make_volume_name_from_path_and_fs (const char *mount_path, const char *fs_type)
@@ -19,7 +19,7 @@
  		return g_strdup (_("Root Volume"));
 Index: libgnomevfs/gnome-vfs-filesystem-type.c
 ===================================================================
---- libgnomevfs/gnome-vfs-filesystem-type.c	(revision 11674)
+--- libgnomevfs/gnome-vfs-filesystem-type.c	(revision 11765)
 +++ libgnomevfs/gnome-vfs-filesystem-type.c	(arbetskopia)
 @@ -127,3 +127,115 @@ _gnome_vfs_filesystem_use_trash (const c
  	
@@ -139,7 +139,7 @@
 +/* End of maemo patch */
 Index: libgnomevfs/gnome-vfs-filesystem-type.h
 ===================================================================
---- libgnomevfs/gnome-vfs-filesystem-type.h	(revision 11674)
+--- libgnomevfs/gnome-vfs-filesystem-type.h	(revision 11765)
 +++ libgnomevfs/gnome-vfs-filesystem-type.h	(arbetskopia)
 @@ -28,5 +28,6 @@
  
@@ -150,18 +150,35 @@
  #endif /* GNOME_VFS_FILESYSTEM_TYPE_H */
 Index: libgnomevfs/gnome-vfs-hal-mounts.c
 ===================================================================
---- libgnomevfs/gnome-vfs-hal-mounts.c	(revision 11674)
+--- libgnomevfs/gnome-vfs-hal-mounts.c	(revision 11765)
 +++ libgnomevfs/gnome-vfs-hal-mounts.c	(arbetskopia)
-@@ -570,6 +570,12 @@ _hal_volume_policy_get_display_name (Gno
- 		goto out;
- 	}
+@@ -327,6 +327,17 @@ _hal_drive_policy_get_display_name (Gnom
+ 	char *vm_name;
+ 	gboolean may_prepend_external;
  
++	if (hal_volume) {
++		const char *mountpoint;
++
++		mountpoint = libhal_volume_get_mount_point (hal_volume);
++		if (mountpoint) {
++			name = _gnome_vfs_filesystem_get_label_for_mmc (mountpoint);
++			if (name) {
++				goto out;
++			}
++		}
++	}
+ 
+ 	name = NULL;
+ 	may_prepend_external = FALSE;
+@@ -484,7 +495,10 @@ _hal_volume_policy_get_display_name (Gno
+ 	char *name;
+ 	char *size_str;
+ 
+-	name = NULL;
 +	name = _gnome_vfs_filesystem_get_label_for_mmc (libhal_volume_get_mount_point (hal_volume));
 +	if (name) {
-+		g_print ("Volume fallback: %s\n", name);
 +		goto out;
 +	}
-+	
- 	/* Fallback: size of media */
  
- 	size_str = gnome_vfs_format_file_size_for_display (libhal_volume_get_size (hal_volume));
+ 	drive_type = libhal_drive_get_type (hal_drive);
+ 	volume_label = libhal_volume_get_label (hal_volume);