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)

diff --git a/ChangeLog b/ChangeLog
index d4ff58b99a5bc30d586d2e22382ce1f6d1b3b6ba..e2c3e5bb69837a0b71f009b184396ff11d409b3f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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)
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d4ff58b99a5bc30d586d2e22382ce1f6d1b3b6ba..e2c3e5bb69837a0b71f009b184396ff11d409b3f 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -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)
 

diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index 2e9ef1f3e02e91b63c997c46efc8b333f23758c4..885df5381a9fbe3380faeb725f847ce723eddd3f 100644 (file)
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -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);