From bf1e0e23e84eb63a4fd81d0cc6e1402fbca66136 Mon Sep 17 00:00:00 2001 From: David Zeuthen Date: Mon, 21 Jul 2008 23:24:07 +0000 Subject: Use 'camera-photo' rather than just 'camera' since gnome-icon-theme in 2008-07-21 David Zeuthen * 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. svn path=/trunk/; revision=1828 --- ChangeLog | 8 ++++++++ daemon/gvfsbackendgphoto2.c | 4 ++-- monitor/gphoto2/ggphoto2volume.c | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 62ec385e..e441113e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-07-21 David Zeuthen + + * 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. + 2008-07-21 David Zeuthen * configure.ac: diff --git a/daemon/gvfsbackendgphoto2.c b/daemon/gvfsbackendgphoto2.c index 7e0b2df3..8ce5d339 100644 --- a/daemon/gvfsbackendgphoto2.c +++ b/daemon/gvfsbackendgphoto2.c @@ -673,7 +673,7 @@ compute_icon_name (GVfsBackendGphoto2 *gphoto2_backend) if (gphoto2_backend->hal_icon_name == NULL) { - result = g_strdup_printf ("camera"); + result = g_strdup_printf ("camera-photo"); } else { @@ -870,7 +870,7 @@ find_udi_for_device (GVfsBackendGphoto2 *gphoto2_backend) } else { - gphoto2_backend->hal_icon_name = g_strdup ("camera"); + gphoto2_backend->hal_icon_name = g_strdup ("camera-photo"); } } } diff --git a/monitor/gphoto2/ggphoto2volume.c b/monitor/gphoto2/ggphoto2volume.c index 1d7a14ff..8cdf8257 100644 --- a/monitor/gphoto2/ggphoto2volume.c +++ b/monitor/gphoto2/ggphoto2volume.c @@ -197,7 +197,7 @@ do_update_from_hal_for_camera (GGPhoto2Volume *v) 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", -- cgit v1.2.1