diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 4 | ||||
| -rw-r--r-- | gtk/gtkicontheme.c | 4 |
3 files changed, 11 insertions, 1 deletions
@@ -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 4288501d24..bba27499e3 100644 --- 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 ebfc282a46..8eb75cf8e4 100644 --- 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 |