callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only broadcast _GTK_LOAD_ICONTHEMES if we detect a real theme change, not

Browse Source 
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:
Matthias Clasen
2005-12-12 17:39:50 +00:00
committed by Matthias Clasen
parent 89e079e10b
commit dd3a8cd122
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2005-12-12 Matthias Clasen <mclasen@redhat.com> 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 * gtk/gtkstatusicon.c (gtk_status_icon_class_init): Register
the size-changed signal correctly. (#323848, Murray Cumming) the size-changed signal correctly. (#323848, Murray Cumming)

4
ChangeLog.pre-2-10
View File

@ -1,5 +1,9 @@
2005-12-12 Matthias Clasen <mclasen@redhat.com> 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 * gtk/gtkstatusicon.c (gtk_status_icon_class_init): Register
the size-changed signal correctly. (#323848, Murray Cumming) the size-changed signal correctly. (#323848, Murray Cumming)

3
gtk/gtkicontheme.c
View File

@ -1158,6 +1158,7 @@ ensure_valid_themes (GtkIconTheme *icon_theme)
{ {
GtkIconThemePrivate *priv = icon_theme->priv; GtkIconThemePrivate *priv = icon_theme->priv;
GTimeVal tv; GTimeVal tv;
gboolean was_valid = priv->themes_valid;
_gtk_icon_theme_ensure_builtin_cache (); _gtk_icon_theme_ensure_builtin_cache ();
@ -1173,7 +1174,7 @@ ensure_valid_themes (GtkIconTheme *icon_theme)
{ {
load_themes (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; static GdkAtom atom_iconthemes = GDK_NONE;
GdkEvent *event = gdk_event_new (GDK_CLIENT_EVENT); GdkEvent *event = gdk_event_new (GDK_CLIENT_EVENT);