AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Stop using the -gtk-icon-theme style property

Browse Source 
We want to just use the current icon theme, always.
This commit is contained in:
Matthias Clasen 2020-04-21 08:37:04 -04:00
parent e75bc2833d
commit 98611735ec
7 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gtk/gtkcssimageicontheme.c
View File

@ -23,7 +23,6 @@
#include <math.h>
#include "gtkcssiconthemevalueprivate.h"
#include "gtksettingsprivate.h"
#include "gtksnapshot.h"
#include "gtkstyleproviderprivate.h"
@ -149,7 +148,7 @@ gtk_css_image_icon_theme_compute (GtkCssImage *image,
copy = g_object_new (GTK_TYPE_CSS_IMAGE_ICON_THEME, NULL);
copy->name = g_strdup (icon_theme->name);
copy->icon_theme = gtk_css_icon_theme_value_get_icon_theme (style->core->icon_theme);
copy->icon_theme = icon_theme->icon_theme;
copy->scale = gtk_style_provider_get_scale (provider);
gtk_icon_theme_lookup_symbolic_colors (style, &copy->color, &copy->success, &copy->warning, &copy->error);

1
gtk/gtkcsspalettevalue.c
View File

@ -19,7 +19,6 @@
#include "gtkcsspalettevalueprivate.h"
#include "gtkcssiconthemevalueprivate.h"
#include "gtkcsscolorvalueprivate.h"
#include "gtkcsscolorvalueprivate.h"
#include "gtkprivate.h"

1
gtk/gtkfilechooserbutton.c
View File

@ -36,7 +36,6 @@
#include "gtkcellrenderertext.h"
#include "gtkcellrendererpixbuf.h"
#include "gtkcombobox.h"
#include "gtkcssiconthemevalueprivate.h"
#include "gtkdroptarget.h"
#include "gtkicontheme.h"
#include "gtkimage.h"

1
gtk/gtkfilesystem.c
View File

@ -27,7 +27,6 @@
#include <glib/gi18n-lib.h>
#include "gtkfilechooser.h"
#include "gtkcssiconthemevalueprivate.h"
#include "gtkintl.h"
#include "gtkprivate.h"
#include "gtkstylecontextprivate.h"

1
gtk/gtkiconhelper.c
View File

@ -24,7 +24,6 @@
#include <math.h>
#include "gtkcssenumvalueprivate.h"
#include "gtkcssiconthemevalueprivate.h"
#include "gtkcssnodeprivate.h"
#include "gtkcssnumbervalueprivate.h"
#include "gtkcssstyleprivate.h"

3
gtk/gtkmountoperation.c
View File

@ -30,7 +30,6 @@
#include "gtkmountoperationprivate.h"
#include "gtkbox.h"
#include "gtkcssiconthemevalueprivate.h"
#include "gtkdbusgenerated.h"
#include "gtkentry.h"
#include "gtkbox.h"
@ -1206,7 +1205,7 @@ add_pid_to_process_list_store (GtkMountOperation *mount_operation,
GtkIconTheme *theme;
GtkIconPaintable *icon;
theme = gtk_css_icon_theme_value_get_icon_theme
theme = gtk_icon_theme_get_for_display (gtk_widget_get_display (GTK_WIDGET (mount_operation->priv->dialog)));
(_gtk_style_context_peek_property (gtk_widget_get_style_context (GTK_WIDGET (mount_operation->priv->dialog)),
GTK_CSS_PROPERTY_ICON_THEME));
icon = gtk_icon_theme_lookup_icon (theme,

7
gtk/gtkwindow.c
View File

@ -34,7 +34,6 @@
#include "gtkbutton.h"
#include "gtkcheckbutton.h"
#include "gtkcsscornervalueprivate.h"
#include "gtkcssiconthemevalueprivate.h"
#include "gtkcsscolorvalueprivate.h"
#include "gtkcssshadowvalueprivate.h"
#include "gtkcssstylepropertyprivate.h"
@ -3363,17 +3362,13 @@ icon_list_from_theme (GtkWindow *window,
{
GtkWindowPrivate *priv = gtk_window_get_instance_private (window);
GList *list;
GtkStyleContext *context;
GtkCssValue *value;
GtkIconTheme *icon_theme;
GtkIconPaintable *info;
GdkTexture *texture;
gint *sizes;
gint i;
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);
icon_theme = gtk_icon_theme_get_for_display (priv->display);
sizes = gtk_icon_theme_get_icon_sizes (icon_theme, name);