Run the reset_styles idle at a priority higher than size negotiation.

2006-08-15  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkicontheme.c (do_theme_change): Run the reset_styles
	idle at a priority higher than size negotiation.  (#350517,
	Søren Sandmann)

diff --git a/ChangeLog b/ChangeLog
index 4288501d245a27a2572c0e5f19bc6e731547e565..bba27499e3f43a06308c9096ff2587c8c695426d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-08-15  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkicontheme.c (do_theme_change): Run the reset_styles
+       idle at a priority higher than size negotiation.  (#350517,
+       Søren Sandmann)
+       
        * gtk/gtkfilesystem.c (gtk_file_info_render_icon) 
        (gtk_file_system_volume_render_icon): Do better fallbacks
        if the icon theme does not have icons.  (#345666,

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 4288501d245a27a2572c0e5f19bc6e731547e565..bba27499e3f43a06308c9096ff2587c8c695426d 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,9 @@
 2006-08-15  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkicontheme.c (do_theme_change): Run the reset_styles
+       idle at a priority higher than size negotiation.  (#350517,
+       Søren Sandmann)
+       
        * gtk/gtkfilesystem.c (gtk_file_info_render_icon) 
        (gtk_file_system_volume_render_icon): Do better fallbacks
        if the icon theme does not have icons.  (#345666,

diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index ebfc282a4626190887e41c2ce5b10ebafba7c861..8eb75cf8e452928384e1556226bfd0f488592874 100644 (file)
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -40,6 +40,7 @@
 #include "gtkiconcache.h"
 #include "gtkbuiltincache.h"
 #include "gtkintl.h"
+#include "gtkmain.h"
 #include "gtksettings.h"
 #include "gtkprivate.h"
 #include "gtkalias.h"
@@ -618,7 +619,8 @@ do_theme_change (GtkIconTheme *icon_theme)
 
   if (!priv->reset_styles_idle)
     priv->reset_styles_idle = 
-      g_idle_add (reset_styles_idle, icon_theme);
+      g_idle_add_full (GTK_PRIORITY_RESIZE + 2, 
+                      reset_styles_idle, icon_theme, NULL);
 }
 
 static void