diff options
author | Matthias Clasen <mclasen@redhat.com> | 2005-08-24 15:28:20 +0000 |
---|---|---|
committer | Matthias Clasen <matthiasc@src.gnome.org> | 2005-08-24 15:28:20 +0000 |
commit | fb8fe489ab34856903287322b2f1f6fb79c60615 (patch) | |
tree | af100c7ae7cefc13a9704ab8e4f6dfa435b83275 | |
parent | 3a16e0e9b7207b2a2be8bc211a4c0b022bdd04e7 (diff) | |
download | gdk-pixbuf-fb8fe489ab34856903287322b2f1f6fb79c60615.tar.gz |
Don't try to send a client message if the screen is NULL. Noticed by
2005-08-24 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkicontheme.c (ensure_valid_themes): Don't try to send a client
message if the screen is NULL. Noticed by Kjartan Maraas.
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ChangeLog.pre-2-10 | 5 | ||||
-rw-r--r-- | ChangeLog.pre-2-8 | 5 | ||||
-rw-r--r-- | gtk/gtkicontheme.c | 2 |
4 files changed, 16 insertions, 1 deletions
@@ -1,5 +1,10 @@ 2005-08-24 Matthias Clasen <mclasen@redhat.com> + * gtk/gtkicontheme.c (ensure_valid_themes): Don't try to send a client + message if the screen is NULL. Noticed by Kjartan Maraas. + +2005-08-24 Matthias Clasen <mclasen@redhat.com> + * Bump version * === Released 2.8.1 === diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index bfbd7cbfb..4b47782f7 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,10 @@ 2005-08-24 Matthias Clasen <mclasen@redhat.com> + * gtk/gtkicontheme.c (ensure_valid_themes): Don't try to send a client + message if the screen is NULL. Noticed by Kjartan Maraas. + +2005-08-24 Matthias Clasen <mclasen@redhat.com> + * Bump version * === Released 2.8.1 === diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index bfbd7cbfb..4b47782f7 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,10 @@ 2005-08-24 Matthias Clasen <mclasen@redhat.com> + * gtk/gtkicontheme.c (ensure_valid_themes): Don't try to send a client + message if the screen is NULL. Noticed by Kjartan Maraas. + +2005-08-24 Matthias Clasen <mclasen@redhat.com> + * Bump version * === Released 2.8.1 === diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c index 07f55e03e..c4e88b255 100644 --- a/gtk/gtkicontheme.c +++ b/gtk/gtkicontheme.c @@ -1143,7 +1143,7 @@ ensure_valid_themes (GtkIconTheme *icon_theme) { load_themes (icon_theme); - if (!priv->check_reload) + if (!priv->check_reload && priv->screen) { static GdkAtom atom_iconthemes = GDK_NONE; GdkEvent *event = gdk_event_new (GDK_CLIENT_EVENT); |