Lerking/gtk
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:41:54 +00:00
committed by Matthias Clasen
parent 2da547c535
commit 4e40304798
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>
* 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/gtktextview.c (gtk_text_view_get_border_window_size): Don't
fall thru to the wrong window types. (#323843)

4
ChangeLog.pre-2-10
View File

@@ -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/gtktextview.c (gtk_text_view_get_border_window_size): Don't
fall thru to the wrong window types. (#323843)

3
gtk/gtkicontheme.c
View File

@@ -1130,6 +1130,7 @@ ensure_valid_themes (GtkIconTheme *icon_theme)
{
GtkIconThemePrivate *priv = icon_theme->priv;
GTimeVal tv;
gboolean was_valid = priv->themes_valid;
if (priv->themes_valid)
{
@@ -1143,7 +1144,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);