rpms/gvfs/F-11 gvfs-1.3.2-gdu-never-use-empty-names.patch, NONE, 1.1 gvfs.spec, 1.136, 1.137

[Tomas Bzatek]

Author: tbzatek

Update of /cvs/extras/rpms/gvfs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31034

Modified Files:
	gvfs.spec 
Added Files:
	gvfs-1.3.2-gdu-never-use-empty-names.patch 
Log Message:
* Wed Jun 17 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.2.3-6
- Never use blank/empty drive names (#504505)


gvfs-1.3.2-gdu-never-use-empty-names.patch:

--- NEW FILE gvfs-1.3.2-gdu-never-use-empty-names.patch ---
>From 5d3ab40b5b0a574f207e7177d2f4c3bd329458a4 Mon Sep 17 00:00:00 2001
From: David Zeuthen <davidz at redhat.com>
Date: Tue, 16 Jun 2009 21:41:45 +0000
Subject: Bug 582772 – gvfsd-computer crashes with SEGSEV in recompute_files

Never use blank/empty drive names.
---
diff --git a/monitor/gdu/ggdudrive.c b/monitor/gdu/ggdudrive.c
index 8e04104..6195f97 100644
--- a/monitor/gdu/ggdudrive.c
+++ b/monitor/gdu/ggdudrive.c
@@ -177,6 +177,15 @@ update_drive (GGduDrive *drive)
   if (device != NULL)
     g_object_unref (device);
 
+  /* Never use empty/blank names (#582772) */
+  if (drive->name == NULL || strlen (drive->name) == 0)
+    {
+      if (drive->device_file != NULL)
+        drive->name = g_strdup_printf (_("Unnamed Drive (%s)"), drive->device_file);
+      else
+        drive->name = g_strdup (_("Unnamed Drive"));
+    }
+
   /* compute whether something changed */
   changed = !((old_is_media_removable == drive->is_media_removable) &&
               (old_has_media == drive->has_media) &&
--
cgit v0.8.2


Index: gvfs.spec
===================================================================
RCS file: /cvs/extras/rpms/gvfs/F-11/gvfs.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -p -r1.136 -r1.137
--- gvfs.spec	17 Jun 2009 00:23:49 -0000	1.136
+++ gvfs.spec	17 Jun 2009 13:22:11 -0000	1.137
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 1.2.3
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -76,7 +76,11 @@ Patch114: 0014-gvfs-use-device-media-det
 # https://bugzilla.redhat.com/show_bug.cgi?id=498649
 Patch115: 0015-gvfs-respect-presentation-hide-for-drives.patch
 
+# Better handling of PC floppy drives
 Patch120: welcome-to-the-80s.patch
+# gvfsd-computer crashes with SEGSEV in recompute_files
+# https://bugzilla.gnome.org/show_bug.cgi?id=582772
+Patch121: gvfs-1.3.2-gdu-never-use-empty-names.patch
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=582373
 Patch200: webdav-username.patch
@@ -183,6 +187,7 @@ media players (Media Transfer Protocol) 
 %patch114 -p1 -b .gdu-automount-only-on-insertion
 %patch115 -p1 -b .gdu-hide-drives
 %patch120 -p1 -b .floppy
+%patch121 -p1 -b .blank-names
 
 %patch200 -p1 -b .webdav-username
 
@@ -328,6 +333,9 @@ update-desktop-database &> /dev/null ||:
 
 
 %changelog
+* Wed Jun 17 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.2.3-6
+- Never use blank/empty drive names (#504505)
+
 * Tue Jun 16 2009 Matthias Clasen <mclasen at redhat.com> - 1.2.3-5
 - Better floppy handling