forked from AuroraMiddleware/gtk
Only broadcast _GTK_LOAD_ICONTHEMES if we detect a real theme change, not
2005-12-12 Matthias Clasen <mclasen@redhat.com> * gtk/gtkicontheme.c (ensure_valid_themes): Only broadcast _GTK_LOAD_ICONTHEMES if we detect a real theme change, not upon initial theme load. (#323876, Peter Lund)
This commit is contained in:
parent
89e079e10b
commit
dd3a8cd122
@ -1,5 +1,9 @@
|
||||
2005-12-12 Matthias Clasen <mclasen@redhat.com>
|
||||
|
||||
* gtk/gtkicontheme.c (ensure_valid_themes): Only broadcast
|
||||
_GTK_LOAD_ICONTHEMES if we detect a real theme change, not
|
||||
upon initial theme load. (#323876, Peter Lund)
|
||||
|
||||
* gtk/gtkstatusicon.c (gtk_status_icon_class_init): Register
|
||||
the size-changed signal correctly. (#323848, Murray Cumming)
|
||||
|
||||
|
@ -1,5 +1,9 @@
|
||||
2005-12-12 Matthias Clasen <mclasen@redhat.com>
|
||||
|
||||
* gtk/gtkicontheme.c (ensure_valid_themes): Only broadcast
|
||||
_GTK_LOAD_ICONTHEMES if we detect a real theme change, not
|
||||
upon initial theme load. (#323876, Peter Lund)
|
||||
|
||||
* gtk/gtkstatusicon.c (gtk_status_icon_class_init): Register
|
||||
the size-changed signal correctly. (#323848, Murray Cumming)
|
||||
|
||||
|
@ -1158,6 +1158,7 @@ ensure_valid_themes (GtkIconTheme *icon_theme)
|
||||
{
|
||||
GtkIconThemePrivate *priv = icon_theme->priv;
|
||||
GTimeVal tv;
|
||||
gboolean was_valid = priv->themes_valid;
|
||||
|
||||
_gtk_icon_theme_ensure_builtin_cache ();
|
||||
|
||||
@ -1173,7 +1174,7 @@ ensure_valid_themes (GtkIconTheme *icon_theme)
|
||||
{
|
||||
load_themes (icon_theme);
|
||||
|
||||
if (!priv->check_reload && priv->screen)
|
||||
if (!priv->check_reload && was_valid && priv->screen)
|
||||
{
|
||||
static GdkAtom atom_iconthemes = GDK_NONE;
|
||||
GdkEvent *event = gdk_event_new (GDK_CLIENT_EVENT);
|
||||
|
Loading…
Reference in New Issue
Block a user