[gtk+] GtkIconHelper: use FORCE_SCALE when force_scale_pixbuf is set

[Matthias Clasen <matthiasc src gnome org>]

commit 6d83b173df5f7de3a0498e98076da9359d506809
Author: Matthias Clasen <mclasen redhat com>
Date:   Sun Jun 22 11:14:41 2014 -0400

    GtkIconHelper: use FORCE_SCALE when force_scale_pixbuf is set
    
    When force_scale_pixbuf is set, the icon helper will scale the
    icon to the requested size (either the pixel size, or the resolved
    icon size), so we can just as well instruct the icon theme code
    to do the scaling for us.

 gtk/gtkiconhelper.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/gtk/gtkiconhelper.c b/gtk/gtkiconhelper.c
index c8977e3..d2d1706 100644
--- a/gtk/gtkiconhelper.c
+++ b/gtk/gtkiconhelper.c
@@ -264,7 +264,7 @@ get_icon_lookup_flags (GtkIconHelper *self, GtkStyleContext *context)
 
   if (self->priv->use_fallback)
     flags |= GTK_ICON_LOOKUP_GENERIC_FALLBACK;
-  if (self->priv->pixel_size != -1)
+  if (self->priv->pixel_size != -1 || self->priv->force_scale_pixbuf)
     flags |= GTK_ICON_LOOKUP_FORCE_SIZE;
 
   flags |= _gtk_style_context_get_icon_lookup_flags (context);