rpms/gvfs/F-11 welcome-to-the-80s.patch, NONE, 1.1 gvfs.spec, 1.135, 1.136

[Matthias Clasen]

Author: mclasen

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

Modified Files:
	gvfs.spec 
Added Files:
	welcome-to-the-80s.patch 
Log Message:
Improve handling of floppy drives


welcome-to-the-80s.patch:

--- NEW FILE welcome-to-the-80s.patch ---
diff --git a/monitor/gdu/ggdudrive.c b/monitor/gdu/ggdudrive.c
index 6195f97..d332e14 100644
--- a/monitor/gdu/ggdudrive.c
+++ b/monitor/gdu/ggdudrive.c
@@ -148,7 +148,10 @@ update_drive (GGduDrive *drive)
   drive->icon = gdu_presentable_get_icon (drive->presentable);
 
   g_free (drive->name);
-  drive->name = gdu_presentable_get_name (drive->presentable);
+  if (_is_pc_floppy_drive (device))
+    drive->name = g_strdup (_("Floppy Drive"));
+  else
+    drive->name = gdu_presentable_get_name (drive->presentable);
 
   /* the GduDevice for an activatable drive (such as RAID) is NULL if the drive is not activated */
   if (device == NULL)
diff --git a/monitor/gdu/ggduvolume.c b/monitor/gdu/ggduvolume.c
index 8f75247..73ad0fc 100644
--- a/monitor/gdu/ggduvolume.c
+++ b/monitor/gdu/ggduvolume.c
@@ -304,7 +304,10 @@ update_volume (GGduVolume *volume)
       volume->icon = gdu_presentable_get_icon (GDU_PRESENTABLE (volume->gdu_volume));
 
       g_free (volume->name);
-      volume->name = gdu_presentable_get_name (GDU_PRESENTABLE (volume->gdu_volume));
+      if (_is_pc_floppy_drive (device))
+        volume->name = g_strdup (_("Floppy Disk"));
+      else
+        volume->name = gdu_presentable_get_name (GDU_PRESENTABLE (volume->gdu_volume));
 
       /* special case the name and icon for audio discs */
       activation_uri = volume->activation_root != NULL ? g_file_get_uri (volume->activation_root) : NULL;
diff --git a/monitor/gdu/ggduvolumemonitor.c b/monitor/gdu/ggduvolumemonitor.c
index 5c80f64..6da7393 100644
--- a/monitor/gdu/ggduvolumemonitor.c
+++ b/monitor/gdu/ggduvolumemonitor.c
@@ -744,6 +744,32 @@ should_mount_be_ignored (GduPool *pool, GduDevice *d)
   return ret;
 }
 
+gboolean
+_is_pc_floppy_drive (GduDevice *device)
+{
+  gboolean ret;
+  gchar **drive_media_compat;
+  const gchar *drive_connection_interface;
+
+  ret = FALSE;
+
+  if (device != NULL)
+    {
+      drive_media_compat = gdu_device_drive_get_media_compatibility (device);
+      drive_connection_interface = gdu_device_drive_get_connection_interface (device);
+
+      if (g_strcmp0 (drive_connection_interface, "platform") == 0 &&
+          (drive_media_compat != NULL &&
+           g_strv_length (drive_media_compat) > 0 &&
+           g_strcmp0 (drive_media_compat[0], "floppy") == 0))
+        {
+          ret = TRUE;
+        }
+    }
+
+  return ret;
+}
+
 static gboolean
 should_volume_be_ignored (GduPool *pool, GduVolume *volume, GList *fstab_mount_points)
 {
@@ -763,7 +789,7 @@ should_volume_be_ignored (GduPool *pool, GduVolume *volume, GList *fstab_mount_p
   usage = gdu_device_id_get_usage (device);
   type = gdu_device_id_get_type (device);
 
-  if (g_strcmp0 (usage, "filesystem") == 0)
+  if (_is_pc_floppy_drive (device) || g_strcmp0 (usage, "filesystem") == 0)
     {
       GUnixMountPoint *mount_point;
 
diff --git a/monitor/gdu/ggduvolumemonitor.h b/monitor/gdu/ggduvolumemonitor.h
index ec559c4..b91ceb9 100644
--- a/monitor/gdu/ggduvolumemonitor.h
+++ b/monitor/gdu/ggduvolumemonitor.h
@@ -55,6 +55,8 @@ GType g_gdu_volume_monitor_get_type (void) G_GNUC_CONST;
 
 GVolumeMonitor *g_gdu_volume_monitor_new                          (void);
 
+gboolean _is_pc_floppy_drive (GduDevice *device);
+
 G_END_DECLS
 
 #endif /* __G_GDU_VOLUME_MONITOR_H__ */


Index: gvfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gvfs/F-11/gvfs.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -p -r1.135 -r1.136
--- gvfs.spec	12 Jun 2009 14:59:53 -0000	1.135
+++ gvfs.spec	17 Jun 2009 00:23:49 -0000	1.136
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 1.2.3
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -76,6 +76,8 @@ 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
 
+Patch120: welcome-to-the-80s.patch
+
 # http://bugzilla.gnome.org/show_bug.cgi?id=582373
 Patch200: webdav-username.patch
 
@@ -180,6 +182,7 @@ media players (Media Transfer Protocol) 
 %patch113 -p1 -b .gdu-vfat-flush
 %patch114 -p1 -b .gdu-automount-only-on-insertion
 %patch115 -p1 -b .gdu-hide-drives
+%patch120 -p1 -b .floppy
 
 %patch200 -p1 -b .webdav-username
 
@@ -325,6 +328,9 @@ update-desktop-database &> /dev/null ||:
 
 
 %changelog
+* Tue Jun 16 2009 Matthias Clasen <mclasen at redhat.com> - 1.2.3-5
+- Better floppy handling
+
 * Fri Jun 12 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.2.3-4
 - Move bash-completion out of profile.d (#466883)