summaryrefslogtreecommitdiff
path: root/gtk/gtkwindow.c
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2017-11-29 17:06:15 -0500
committerMatthias Clasen <mclasen@redhat.com>2017-11-29 17:28:15 -0500
commit83ab83043eef6404690c580d2da1739b7a88e4ae (patch)
treed789d365978350c2ec4f89797e7b18458534e802 /gtk/gtkwindow.c
parent9259ca98f3d15e626d703764b91829e7b1240288 (diff)
downloadgtk+-83ab83043eef6404690c580d2da1739b7a88e4ae.tar.gz
Cosmetic formatting fixes
Diffstat (limited to 'gtk/gtkwindow.c')
-rw-r--r--gtk/gtkwindow.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 0ffd006388..be04e26bcb 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -4398,15 +4398,17 @@ icon_list_from_theme (GtkWindow *window,
{
GtkWindowPrivate *priv = window->priv;
GList *list;
+ GtkStyleContext *context;
+ GtkCssValue *value;
GtkIconTheme *icon_theme;
GdkTexture *icon;
GdkPixbuf *pixbuf;
gint *sizes;
gint i;
- icon_theme = gtk_css_icon_theme_value_get_icon_theme
- (_gtk_style_context_peek_property (gtk_widget_get_style_context (GTK_WIDGET (window)),
- GTK_CSS_PROPERTY_ICON_THEME));
+ context = gtk_widget_get_style_context (GTK_WIDGET (window));
+ value = _gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_ICON_THEME);
+ icon_theme = gtk_css_icon_theme_value_get_icon_theme (value);
sizes = gtk_icon_theme_get_icon_sizes (icon_theme, name);
@@ -4414,10 +4416,10 @@ icon_list_from_theme (GtkWindow *window,
for (i = 0; sizes[i]; i++)
{
/* FIXME
- * We need an EWMH extension to handle scalable icons
- * by passing their name to the WM. For now just use a
+ * We need an EWMH extension to handle scalable icons
+ * by passing their name to the WM. For now just use a
* fixed size of 48.
- */
+ */
if (sizes[i] == -1)
pixbuf = gtk_icon_theme_load_icon_for_scale (icon_theme, name,
48, priv->scale,
@@ -4428,7 +4430,7 @@ icon_list_from_theme (GtkWindow *window,
0, NULL);
if (pixbuf)
{
- icon = gdk_texture_new_for_pixbuf (pixbuf);
+ i icon = gdk_texture_new_for_pixbuf (pixbuf);
list = g_list_append (list, icon);
g_object_unref (pixbuf);
}