summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorChristian Persch <chpe@gnome.org>2009-11-23 14:09:55 +0100
committerChristian Persch <chpe@gnome.org>2009-11-27 19:17:23 +0100
commit7abd4d1359ec6b376601169198bbe9a025461df3 (patch)
tree5e0a62ecef61ed7deddaa0e0987e757afdb8a346 /modules
parent65485cbc7c8d48513aa7e14477a2eacf82276f9b (diff)
downloadgtk+-7abd4d1359ec6b376601169198bbe9a025461df3.tar.gz
Implement gail_image_get_image_size for storage GICON and ICON_NAME
Bug #602724.
Diffstat (limited to 'modules')
-rw-r--r--modules/other/gail/gailimage.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/modules/other/gail/gailimage.c b/modules/other/gail/gailimage.c
index e4229250fd..6dd1e02bab 100644
--- a/modules/other/gail/gailimage.c
+++ b/modules/other/gail/gailimage.c
@@ -229,20 +229,16 @@ gail_image_get_image_size (AtkImage *image,
break;
}
case GTK_IMAGE_STOCK:
- {
- GtkIconSize size;
- GtkSettings *settings;
- settings = gtk_settings_get_for_screen (gtk_widget_get_screen (widget));
- gtk_image_get_stock(gtk_image, NULL, &size);
- gtk_icon_size_lookup_for_settings (settings, size, width, height);
- break;
- }
case GTK_IMAGE_ICON_SET:
+ case GTK_IMAGE_ICON_NAME:
+ case GTK_IMAGE_GICON:
{
GtkIconSize size;
GtkSettings *settings;
+
settings = gtk_settings_get_for_screen (gtk_widget_get_screen (widget));
- gtk_image_get_icon_set(gtk_image, NULL, &size);
+
+ g_object_get (gtk_image, "icon-size", &size, NULL);
gtk_icon_size_lookup_for_settings (settings, size, width, height);
break;
}