gvfs r2270 - in trunk: . monitor/hal

[alexl svn gnome org]

Author: alexl
Date: Mon Mar  2 11:59:29 2009
New Revision: 2270
URL: http://svn.gnome.org/viewvc/gvfs?rev=2270&view=rev

Log:
2009-03-02  Alexander Larsson  <alexl redhat com>

	Bug 545025 â gvfs doesnt use hal storage.icon.drive/volume properties

        * monitor/hal/ghaldrive.c:
        * monitor/hal/ghalmount.c:
	Use storage.icon.drive and storage.icon.volume, not
	info.desktop.icon as per the spec.

	Patch from Karl Relton



Modified:
   trunk/ChangeLog
   trunk/monitor/hal/ghaldrive.c
   trunk/monitor/hal/ghalmount.c

Modified: trunk/monitor/hal/ghaldrive.c
==============================================================================
--- trunk/monitor/hal/ghaldrive.c	(original)
+++ trunk/monitor/hal/ghaldrive.c	Mon Mar  2 11:59:29 2009
@@ -231,7 +231,7 @@
   drive_type = hal_device_get_property_string (d, "storage.drive_type");
   drive_bus = hal_device_get_property_string (d, "storage.bus");
   is_audio_player = hal_device_has_capability (d, "portable_audio_player");
-  icon_from_hal = hal_device_get_property_string (d, "info.desktop.icon");
+  icon_from_hal = hal_device_get_property_string (d, "storage.icon.drive");
 
   if (strlen (icon_from_hal) > 0)
     s = g_strdup (icon_from_hal);

Modified: trunk/monitor/hal/ghalmount.c
==============================================================================
--- trunk/monitor/hal/ghalmount.c	(original)
+++ trunk/monitor/hal/ghalmount.c	Mon Mar  2 11:59:29 2009
@@ -354,8 +354,8 @@
   volume_disc_is_blank = hal_device_get_property_bool (volume, "volume.disc.is_blank");
   volume_disc_type = hal_device_get_property_string (volume, "volume.disc.type");
   is_audio_player = hal_device_has_capability (drive, "portable_audio_player");
-  icon_from_hal = hal_device_get_property_string (drive, "info.desktop.icon");
-  volume_icon_from_hal = hal_device_get_property_string (volume, "info.desktop.icon");
+  icon_from_hal = hal_device_get_property_string (drive, "storage.icon.drive");
+  volume_icon_from_hal = hal_device_get_property_string (volume, "storage.icon.volume");
   name_from_hal = hal_device_get_property_string (drive, "info.desktop.name");
   volume_name_from_hal = hal_device_get_property_string (volume, "info.desktop.name");