[gtk+/wip/baedert/symbolic-icons: 4/8] iconhelper: Un-duplicate some code



commit e297d26bf3189b448179f5b2d75b657964539637
Author: Timm Bäder <mail baedert org>
Date:   Fri Feb 5 09:32:16 2016 +0100

    iconhelper: Un-duplicate some code

 gtk/gtkiconhelper.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/gtk/gtkiconhelper.c b/gtk/gtkiconhelper.c
index 9c87a8f..8a4c7fe 100644
--- a/gtk/gtkiconhelper.c
+++ b/gtk/gtkiconhelper.c
@@ -481,18 +481,20 @@ ensure_surface_for_gicon (GtkIconHelper    *self,
       symbolic = FALSE;
     }
 
+
+
+  surface = gdk_cairo_surface_create_from_pixbuf (destination, scale, gtk_widget_get_window 
(gtk_css_gadget_get_owner (GTK_CSS_GADGET (self))));
+
   if (!symbolic)
     {
       GtkCssIconEffect icon_effect;
 
-      surface = gdk_cairo_surface_create_from_pixbuf (destination, scale, gtk_widget_get_window 
(gtk_css_gadget_get_owner (GTK_CSS_GADGET (self))));
       icon_effect = _gtk_css_icon_effect_value_get (gtk_css_style_get_value (style, 
GTK_CSS_PROPERTY_ICON_EFFECT));
       gtk_css_icon_effect_apply (icon_effect, surface);
       priv->surface_is_symbolic = FALSE;
     }
   else
     {
-      surface = gdk_cairo_surface_create_from_pixbuf (destination, scale, gtk_widget_get_window 
(gtk_css_gadget_get_owner (GTK_CSS_GADGET (self))));
       priv->surface_is_symbolic = TRUE;
     }
   g_object_unref (destination);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]