gvfs r1828 - in trunk: . daemon monitor/gphoto2

[davidz svn gnome org]

Author: davidz
Date: Mon Jul 21 23:24:07 2008
New Revision: 1828
URL: http://svn.gnome.org/viewvc/gvfs?rev=1828&view=rev

Log:
2008-07-21  David Zeuthen  <davidz redhat com>

	* monitor/gphoto2/ggphoto2volume.c (do_update_from_hal_for_camera):
	* daemon/gvfsbackendgphoto2.c (compute_icon_name):
	(find_udi_for_device):
	Use 'camera-photo' rather than just 'camera' since gnome-icon-theme
	in 2.23/2.24 no longer ships 'camera'. Now the icons look fine again.



Modified:
   trunk/ChangeLog
   trunk/daemon/gvfsbackendgphoto2.c
   trunk/monitor/gphoto2/ggphoto2volume.c

Modified: trunk/daemon/gvfsbackendgphoto2.c
==============================================================================
--- trunk/daemon/gvfsbackendgphoto2.c	(original)
+++ trunk/daemon/gvfsbackendgphoto2.c	Mon Jul 21 23:24:07 2008
@@ -673,7 +673,7 @@
 
   if (gphoto2_backend->hal_icon_name == NULL)
     {
-      result = g_strdup_printf ("camera");
+      result = g_strdup_printf ("camera-photo");
     }
   else
     {
@@ -870,7 +870,7 @@
                                 }
                               else
                                 {
-                                  gphoto2_backend->hal_icon_name = g_strdup ("camera");
+                                  gphoto2_backend->hal_icon_name = g_strdup ("camera-photo");
                                 }
                             }
                         }

Modified: trunk/monitor/gphoto2/ggphoto2volume.c
==============================================================================
--- trunk/monitor/gphoto2/ggphoto2volume.c	(original)
+++ trunk/monitor/gphoto2/ggphoto2volume.c	Mon Jul 21 23:24:07 2008
@@ -197,7 +197,7 @@
   else if (is_audio_player)
     v->icon = g_strdup ("multimedia-player");
   else
-    v->icon = g_strdup ("camera");
+    v->icon = g_strdup ("camera-photo");
 
   g_object_set_data_full (G_OBJECT (v),
                           "hal-storage-device-capabilities",