From aecf9d19109887e6df942d12322cd045ccecb8e3 Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Tue, 24 Jan 2017 03:14:53 +0100
Subject: [PATCH] image: Don't take icon size in set_from_definition()

---
 gtk/gtkdnd.c          | 2 +-
 gtk/gtkimage.c        | 5 +----
 gtk/gtkimageprivate.h | 3 +--
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index 3caf43a375..8158f92707 100644
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -1588,7 +1588,7 @@ set_icon_helper (GdkDragContext     *context,
   widget = gtk_image_new ();
   gtk_widget_show (widget);
 
-  gtk_image_set_from_definition (GTK_IMAGE (widget), def, GTK_ICON_SIZE_DND);
+  gtk_image_set_from_definition (GTK_IMAGE (widget), def);
 
   gtk_drag_set_icon_widget_internal (context, widget, hot_x, hot_y, TRUE);
 }
diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c
index 734d783d23..bdaac343f7 100644
--- a/gtk/gtkimage.c
+++ b/gtk/gtkimage.c
@@ -1193,8 +1193,7 @@ gtk_image_notify_for_storage_type (GtkImage     *image,
 
 void
 gtk_image_set_from_definition (GtkImage           *image,
-                               GtkImageDefinition *def,
-                               GtkIconSize         icon_size)
+                               GtkImageDefinition *def)
 {
   GtkImagePrivate *priv = gtk_image_get_instance_private (image);
 
@@ -1211,8 +1210,6 @@ gtk_image_set_from_definition (GtkImage           *image,
       gtk_image_notify_for_storage_type (image, gtk_image_definition_get_storage_type (def));
     }
 
-  _gtk_icon_helper_set_icon_size (&priv->icon_helper, icon_size);
-  
   g_object_thaw_notify (G_OBJECT (image));
 }
 
diff --git a/gtk/gtkimageprivate.h b/gtk/gtkimageprivate.h
index 0424fcd93a..58b1804c66 100644
--- a/gtk/gtkimageprivate.h
+++ b/gtk/gtkimageprivate.h
@@ -33,8 +33,7 @@
 G_BEGIN_DECLS
 
 void            gtk_image_set_from_definition           (GtkImage               *image,
-                                                         GtkImageDefinition     *def,
-                                                         GtkIconSize             size);
+                                                         GtkImageDefinition     *def);
 
 
 GtkImageDefinition * gtk_image_get_definition           (GtkImage *image);