[gtk+/wip/baedert/symbolic-icons: 6/9] GtkImage: Don't always invalidate the icon helper

[Timm Bäder <baedert src gnome org>]

commit 96f7b02207b3ca75e28aea56d28ca6a90cea5acb
Author: Timm Bäder <mail baedert org>
Date:   Fri Feb 5 10:37:04 2016 +0100

    GtkImage: Don't always invalidate the icon helper

 gtk/gtkimage.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c
index 32d43bd..3d1783b 100644
--- a/gtk/gtkimage.c
+++ b/gtk/gtkimage.c
@@ -1929,8 +1929,11 @@ gtk_image_style_updated (GtkWidget *widget)
   if (context)
     {
       GtkCssStyleChange *change = gtk_style_context_get_change (context);
+      gboolean symbolic = gtk_icon_helper_surface_is_symbolic (priv->icon_helper);
 
-      if (change && gtk_css_style_change_affects (change, GTK_CSS_AFFECTS_ICON))
+      if (change &&
+          ((gtk_css_style_change_affects (change, GTK_CSS_AFFECTS_SYMBOLIC_ICON) && symbolic) ||
+           (gtk_css_style_change_affects (change, GTK_CSS_AFFECTS_ICON) && !symbolic)))
         gtk_icon_helper_invalidate (priv->icon_helper);
     }