diff options
| author | Timm Bäder <mail@baedert.org> | 2016-02-06 09:27:00 +0100 |
|---|---|---|
| committer | Timm Bäder <mail@baedert.org> | 2016-02-07 19:16:26 +0100 |
| commit | 2902063f2437d8f8838234dbbba71e9db52b4bb1 (patch) | |
| tree | 7aa5f98892f0294e077735050d7930766ddcf30a /gtk/gtkiconhelper.c | |
| parent | c360b5fb498985ca8d351e9c9d518b0d78b834ba (diff) | |
| download | gtk+-2902063f2437d8f8838234dbbba71e9db52b4bb1.tar.gz | |
iconhelper: Un-duplicate some code
Diffstat (limited to 'gtk/gtkiconhelper.c')
| -rw-r--r-- | gtk/gtkiconhelper.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/gtk/gtkiconhelper.c b/gtk/gtkiconhelper.c index 73f105f130..c18080394d 100644 --- a/gtk/gtkiconhelper.c +++ b/gtk/gtkiconhelper.c @@ -478,18 +478,15 @@ 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); } - else - { - surface = gdk_cairo_surface_create_from_pixbuf (destination, scale, gtk_widget_get_window (gtk_css_gadget_get_owner (GTK_CSS_GADGET (self)))); - } g_object_unref (destination); return surface; |