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

st-theme-context: Punt icon theme changes to an idle

Browse Source 
Icon theme change signals aren't noticed immediately, they're usually
noticed when trying to load an icon. Since icon theme changes cause a
style change, and most icon widgets try to re-load their texture during
a style change, this means that we get a stack like this:

  st_texture_cache_load_icon
  gtk_icon_theme_lookup_icon
  gtk_icon_theme_changed
  st_widget_style_changed
  st_texture_cache_load_icon

Rather than making every place that uses StTextureCache re-entrant,
punt the notifying of icon theme changes to an idle handler instead.

https://bugzilla.gnome.org/show_bug.cgi?id=673512
This commit is contained in:
Jasper St. Pierre 2012-04-04 16:22:42 -04:00
parent 00091a2acb
commit 0a7968a2e5
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/st/st-theme-context.c
View File

@ -129,10 +129,11 @@ on_stage_destroy (ClutterStage *stage)
g_object_unref (context); g_object_unref (context);
} }
static void static gboolean
emit_changed (StThemeContext *context) emit_changed (StThemeContext *context)
{ {
g_signal_emit (context, signals[CHANGED], 0); g_signal_emit (context, signals[CHANGED], 0);
return FALSE;
} }
static void static void
@ -156,7 +157,7 @@ on_icon_theme_changed (StTextureCache *cache,
* icon_name => icon lookup, faking a theme context change is a good way * icon_name => icon lookup, faking a theme context change is a good way
* to force users such as StIcon to look up icons again. Don't bother recreating * to force users such as StIcon to look up icons again. Don't bother recreating
* the root node, though. */ * the root node, though. */
emit_changed (context); g_idle_add ((GSourceFunc) emit_changed, context);
} }
/** /**