From bc1b53a34c8666404bb2220a8c89ff81d10a3026 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Wed, 2 Dec 2015 03:18:26 +0100 Subject: css: Query icon theme from style, not from settings No need to look at the settings when the CSS has a property for the icon theme. --- gtk/gtkcssimageicontheme.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'gtk/gtkcssimageicontheme.c') diff --git a/gtk/gtkcssimageicontheme.c b/gtk/gtkcssimageicontheme.c index 484b77a942..73c8a628a1 100644 --- a/gtk/gtkcssimageicontheme.c +++ b/gtk/gtkcssimageicontheme.c @@ -23,6 +23,7 @@ #include +#include "gtkcssiconthemevalueprivate.h" #include "gtkcssrgbavalueprivate.h" #include "gtksettingsprivate.h" #include "gtkstyleproviderprivate.h" @@ -133,18 +134,10 @@ gtk_css_image_icon_theme_compute (GtkCssImage *image, { GtkCssImageIconTheme *icon_theme = GTK_CSS_IMAGE_ICON_THEME (image); GtkCssImageIconTheme *copy; - GtkSettings *settings; - GdkScreen *screen; - - settings = _gtk_style_provider_private_get_settings (provider); - if (settings == NULL) - screen = gdk_screen_get_default (); - else - screen = _gtk_settings_get_screen (settings); copy = g_object_new (GTK_TYPE_CSS_IMAGE_ICON_THEME, NULL); copy->name = g_strdup (icon_theme->name); - copy->icon_theme = gtk_icon_theme_get_for_screen (screen); + copy->icon_theme = gtk_css_icon_theme_value_get_icon_theme (gtk_css_style_get_value (style, GTK_CSS_PROPERTY_ICON_THEME)); copy->scale = _gtk_style_provider_private_get_scale (provider); copy->color = *_gtk_css_rgba_value_get_rgba (gtk_css_style_get_value (style, GTK_CSS_PROPERTY_COLOR)); -- cgit v1.2.1