[gtk/fix-icontheme-invalidation] Revert "css: keep a ref on the icon theme"



commit 974d16361f2900ed1333d7f09a34207ca9fe03fe
Author: Alexander Larsson <alexl redhat com>
Date:   Wed Apr 22 13:32:45 2020 +0200

    Revert "css: keep a ref on the icon theme"
    
    This reverts commit 39c25c93eeeb56c3fd9271e865a04a3a96ec5ffd.

 gtk/gtkcssimageicontheme.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)
---
diff --git a/gtk/gtkcssimageicontheme.c b/gtk/gtkcssimageicontheme.c
index fe32ec0986..4fed08546b 100644
--- a/gtk/gtkcssimageicontheme.c
+++ b/gtk/gtkcssimageicontheme.c
@@ -145,14 +145,10 @@ gtk_css_image_icon_theme_compute (GtkCssImage      *image,
 {
   GtkCssImageIconTheme *icon_theme = GTK_CSS_IMAGE_ICON_THEME (image);
   GtkCssImageIconTheme *copy;
-  GtkSettings *settings;
-  GdkDisplay *display;
 
   copy = g_object_new (GTK_TYPE_CSS_IMAGE_ICON_THEME, NULL);
   copy->name = g_strdup (icon_theme->name);
-  settings = gtk_style_provider_get_settings (provider);
-  display = _gtk_settings_get_display (settings);
-  copy->icon_theme = g_object_ref (gtk_icon_theme_get_for_display (display));
+  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);
 
@@ -177,7 +173,6 @@ gtk_css_image_icon_theme_dispose (GObject *object)
   g_free (icon_theme->name);
   icon_theme->name = NULL;
 
-  g_clear_object (&icon_theme->icon_theme);
   g_clear_object (&icon_theme->cached_icon);
 
   G_OBJECT_CLASS (_gtk_css_image_icon_theme_parent_class)->dispose (object);
@@ -202,7 +197,7 @@ _gtk_css_image_icon_theme_class_init (GtkCssImageIconThemeClass *klass)
 static void
 _gtk_css_image_icon_theme_init (GtkCssImageIconTheme *icon_theme)
 {
-  icon_theme->icon_theme = g_object_ref (gtk_icon_theme_get_for_display (gdk_display_get_default ()));
+  icon_theme->icon_theme = gtk_icon_theme_get_for_display (gdk_display_get_default ());
   icon_theme->scale = 1;
   icon_theme->cached_size = -1;
   icon_theme->cached_icon = NULL;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]