[gtk+/gtk-2-18] Implement gail_image_get_image_size for storage GICON and ICON_NAME

[Matthias Clasen <matthiasc src gnome org>]

commit 7ef6a12b583cc33d8e74821b924826194d1bab2e
Author: Christian Persch <chpe gnome org>
Date:   Mon Nov 23 14:09:55 2009 +0100

    Implement gail_image_get_image_size for storage GICON and ICON_NAME
    
    Bug #602724.
    (cherry picked from commit 7abd4d1359ec6b376601169198bbe9a025461df3)

 modules/other/gail/gailimage.c |   14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)
---
diff --git a/modules/other/gail/gailimage.c b/modules/other/gail/gailimage.c
index e422925..6dd1e02 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;
     }