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/gtkmountoperation.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gtk/gtkmountoperation.c') diff --git a/gtk/gtkmountoperation.c b/gtk/gtkmountoperation.c index 4d7a87b0a4..f95834d4d1 100644 --- a/gtk/gtkmountoperation.c +++ b/gtk/gtkmountoperation.c @@ -29,6 +29,7 @@ #include "gtkmountoperationprivate.h" #include "gtkbox.h" +#include "gtkcssiconthemevalueprivate.h" #include "gtkdbusgenerated.h" #include "gtkentry.h" #include "gtkbox.h" @@ -49,6 +50,7 @@ #include "gtkmenuitem.h" #include "gtkmain.h" #include "gtksettings.h" +#include "gtkstylecontextprivate.h" #include @@ -1096,7 +1098,9 @@ add_pid_to_process_list_store (GtkMountOperation *mount_operation, if (pixbuf == NULL) { GtkIconTheme *theme; - theme = gtk_icon_theme_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (mount_operation->priv->dialog))); + theme = gtk_css_icon_theme_value_get_icon_theme + (_gtk_style_context_peek_property (gtk_widget_get_style_context (GTK_WIDGET (mount_operation->priv->dialog)), + GTK_CSS_PROPERTY_ICON_THEME)); pixbuf = gtk_icon_theme_load_icon (theme, "application-x-executable", 24, -- cgit v1.2.1