isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

st/icon-theme: Use regular idle source over gdk_threads

Browse Source 
The shell code isn't threaded, so there's no reason for pulling
in Gdk's thread support.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2620>
This commit is contained in:
Florian Müllner 2023-02-01 16:59:38 +01:00 committed by Marge Bot
parent 8d2e40f8bd
commit 3dc3170f92
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/st/st-icon-theme.c
View File

@ -45,7 +45,6 @@
#include "deprecated/gtkiconfactory.h" #include "deprecated/gtkiconfactory.h"
#include "st-icon-cache.h" #include "st-icon-cache.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkmain.h"
#include "deprecated/gtknumerableiconprivate.h" #include "deprecated/gtknumerableiconprivate.h"
#include "gtkstylecontextprivate.h" #include "gtkstylecontextprivate.h"
@ -195,7 +194,7 @@ struct _GtkIconThemePrivate
glong last_stat_time; glong last_stat_time;
GList *dir_mtimes; GList *dir_mtimes;
gulong theme_changed_idle; guint theme_changed_idle;
}; };
typedef struct { typedef struct {
@ -792,9 +791,7 @@ queue_theme_changed (GtkIconTheme *icon_theme)
if (!priv->theme_changed_idle) if (!priv->theme_changed_idle)
{ {
priv->theme_changed_idle = priv->theme_changed_idle = g_idle_add (theme_changed_idle, icon_theme);
gdk_threads_add_idle_full (GTK_PRIORITY_RESIZE - 2,
theme_changed_idle, icon_theme, NULL);
g_source_set_name_by_id (priv->theme_changed_idle, "[gtk+] theme_changed_idle"); g_source_set_name_by_id (priv->theme_changed_idle, "[gtk+] theme_changed_idle");
} }
} }
@ -847,8 +844,7 @@ gtk_icon_theme_finalize (GObject *object)
g_hash_table_destroy (priv->info_cache); g_hash_table_destroy (priv->info_cache);
g_assert (priv->info_cache_lru == NULL); g_assert (priv->info_cache_lru == NULL);
if (priv->theme_changed_idle) g_clear_handle_id (&priv->theme_changed_idle, g_source_remove);
g_source_remove (priv->theme_changed_idle);
unset_screen (icon_theme); unset_screen (icon_theme);