gnome-vfs-no-hal/hal-show-volume-names.patch

   1 Index: gnome-vfs-hal-mounts.c
   2 ===================================================================
   3 RCS file: /cvs/gnome/gnome-vfs/libgnomevfs/gnome-vfs-hal-mounts.c,v
   4 retrieving revision 1.33
   5 diff -u -p -r1.33 gnome-vfs-hal-mounts.c
   6 --- gnome-vfs/libgnomevfs/gnome-vfs-hal-mounts.c        7 Jul 2006 15:56:57 -0000       1.33
   7 +++ gnome-vfs/libgnomevfs/gnome-vfs-hal-mounts.c        14 Jul 2006 18:48:51 -0000
   8 @@ -877,6 +877,7 @@ _hal_add_volume (GnomeVFSVolumeMonitorDa
   9         GnomeVFSDrive *drive;
  10         GnomeVFSVolumeMonitor *volume_monitor;
  11         char *name;
  12 +  char *icon;
  13         gboolean allowed_by_policy;
  14         const char *backing_udi;
  15
  16 @@ -975,6 +976,8 @@ _hal_add_volume (GnomeVFSVolumeMonitorDa
  17          */
  18         drive = _gnome_vfs_volume_monitor_find_drive_by_hal_udi (volume_monitor, libhal_volume_get_udi (hal_volume));
  19         if (drive == NULL && allowed_by_policy) {
  20 +    name = _hal_drive_policy_get_display_name (volume_monitor_daemon, hal_drive, hal_volume);
  21 +    icon = _hal_drive_policy_get_icon (volume_monitor_daemon, hal_drive, hal_volume);
  22                 drive = g_object_new (GNOME_VFS_TYPE_DRIVE, NULL);
  23                 if (libhal_volume_disc_has_audio (hal_volume)) {
  24                         drive->priv->activation_uri = g_strdup_printf ("cdda://%s",
  25 @@ -989,16 +992,16 @@ _hal_add_volume (GnomeVFSVolumeMonitorDa
  26                          * So just set it to the empty string
  27                          */
  28                         drive->priv->activation_uri = g_strdup ("");
  29 +      g_free (name);
  30 +      name = _hal_volume_policy_get_display_name (volume_monitor_daemon, hal_drive, hal_volume);
  31 +      g_free (icon);
  32 +      icon = _hal_volume_policy_get_icon (volume_monitor_daemon, hal_drive, hal_volume);
  33                 }
  34                 drive->priv->is_connected = TRUE;
  35                 drive->priv->device_path = g_strdup (libhal_volume_get_device_file (hal_volume));
  36                 drive->priv->device_type = _hal_get_gnome_vfs_device_type (hal_drive);
  37
  38 -               /* TODO: could add an icon of a drive with media in it since this codepath only
  39 -                * handles drives with media in them
  40 -                */
  41 -               drive->priv->icon = _hal_drive_policy_get_icon (volume_monitor_daemon, hal_drive, NULL);
  42 -               name = _hal_drive_policy_get_display_name (volume_monitor_daemon, hal_drive, hal_volume);
  43 +    drive->priv->icon = icon;
  44                 drive->priv->display_name = _gnome_vfs_volume_monitor_uniquify_drive_name (volume_monitor, name);
  45                 g_free (name);
  46                 name = g_utf8_casefold (drive->priv->display_name, -1);