From fb8fe489ab34856903287322b2f1f6fb79c60615 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 24 Aug 2005 15:28:20 +0000 Subject: [PATCH] Don't try to send a client message if the screen is NULL. Noticed by 2005-08-24 Matthias Clasen * gtk/gtkicontheme.c (ensure_valid_themes): Don't try to send a client message if the screen is NULL. Noticed by Kjartan Maraas. --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkicontheme.c | 2 +- 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index bfbd7cbfb2..4b47782f78 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-08-24 Matthias Clasen + + * 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 * Bump version diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index bfbd7cbfb2..4b47782f78 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2005-08-24 Matthias Clasen + + * 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 * Bump version diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index bfbd7cbfb2..4b47782f78 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2005-08-24 Matthias Clasen + + * 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 * Bump version diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c index 07f55e03e7..c4e88b2550 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);