[gtk+/wip/baedert/symbolic-icons: 14/19] iconhelper: Un-duplicate some code
- From: Timm Bäder <baedert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/baedert/symbolic-icons: 14/19] iconhelper: Un-duplicate some code
- Date: Sat, 6 Feb 2016 08:31:16 +0000 (UTC)
commit 0f4b8d9664234b92edab6a78846a2ff96cc6e735
Author: Timm Bäder <mail baedert org>
Date: Sat Feb 6 09:27:00 2016 +0100
iconhelper: Un-duplicate some code
gtk/gtkiconhelper.c | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
---
diff --git a/gtk/gtkiconhelper.c b/gtk/gtkiconhelper.c
index 73f105f..c180803 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;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]