From aeb608afeccb71b6d649b4560c28a580e7f50353 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Sun, 15 Dec 2002 03:11:40 +0000 Subject: [PATCH] Don't call status_window_set_text() if the status window doesn't already Sat Dec 14 22:03:21 2002 Owen Taylor * modules/input/gtkimcontextxim.c (status_window_hide): Don't call status_window_set_text() if the status window doesn't already exist. (#100933, reported by Anand Subra) * modules/input/gtkimcontextxim.c (status_window_show): Don't bother creating the status window here, wait for the set_text(). (Fixes a warning) --- ChangeLog | 10 ++++++++++ ChangeLog.pre-2-10 | 10 ++++++++++ ChangeLog.pre-2-2 | 10 ++++++++++ ChangeLog.pre-2-4 | 10 ++++++++++ ChangeLog.pre-2-6 | 10 ++++++++++ ChangeLog.pre-2-8 | 10 ++++++++++ modules/input/gtkimcontextxim.c | 7 +++---- 7 files changed, 63 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index c462519c05..3babe4d212 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Sat Dec 14 22:03:21 2002 Owen Taylor + + * modules/input/gtkimcontextxim.c (status_window_hide): Don't + call status_window_set_text() if the status window doesn't + already exist. (#100933, reported by Anand Subra) + + * modules/input/gtkimcontextxim.c (status_window_show): + Don't bother creating the status window here, wait for + the set_text(). (Fixes a warning) + 2002-12-15 Matthias Clasen * gtk/gtkcalendar.c: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c462519c05..3babe4d212 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,13 @@ +Sat Dec 14 22:03:21 2002 Owen Taylor + + * modules/input/gtkimcontextxim.c (status_window_hide): Don't + call status_window_set_text() if the status window doesn't + already exist. (#100933, reported by Anand Subra) + + * modules/input/gtkimcontextxim.c (status_window_show): + Don't bother creating the status window here, wait for + the set_text(). (Fixes a warning) + 2002-12-15 Matthias Clasen * gtk/gtkcalendar.c: diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index c462519c05..3babe4d212 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,13 @@ +Sat Dec 14 22:03:21 2002 Owen Taylor + + * modules/input/gtkimcontextxim.c (status_window_hide): Don't + call status_window_set_text() if the status window doesn't + already exist. (#100933, reported by Anand Subra) + + * modules/input/gtkimcontextxim.c (status_window_show): + Don't bother creating the status window here, wait for + the set_text(). (Fixes a warning) + 2002-12-15 Matthias Clasen * gtk/gtkcalendar.c: diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index c462519c05..3babe4d212 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,13 @@ +Sat Dec 14 22:03:21 2002 Owen Taylor + + * modules/input/gtkimcontextxim.c (status_window_hide): Don't + call status_window_set_text() if the status window doesn't + already exist. (#100933, reported by Anand Subra) + + * modules/input/gtkimcontextxim.c (status_window_show): + Don't bother creating the status window here, wait for + the set_text(). (Fixes a warning) + 2002-12-15 Matthias Clasen * gtk/gtkcalendar.c: diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index c462519c05..3babe4d212 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,13 @@ +Sat Dec 14 22:03:21 2002 Owen Taylor + + * modules/input/gtkimcontextxim.c (status_window_hide): Don't + call status_window_set_text() if the status window doesn't + already exist. (#100933, reported by Anand Subra) + + * modules/input/gtkimcontextxim.c (status_window_show): + Don't bother creating the status window here, wait for + the set_text(). (Fixes a warning) + 2002-12-15 Matthias Clasen * gtk/gtkcalendar.c: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index c462519c05..3babe4d212 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,13 @@ +Sat Dec 14 22:03:21 2002 Owen Taylor + + * modules/input/gtkimcontextxim.c (status_window_hide): Don't + call status_window_set_text() if the status window doesn't + already exist. (#100933, reported by Anand Subra) + + * modules/input/gtkimcontextxim.c (status_window_show): + Don't bother creating the status window here, wait for + the set_text(). (Fixes a warning) + 2002-12-15 Matthias Clasen * gtk/gtkcalendar.c: diff --git a/modules/input/gtkimcontextxim.c b/modules/input/gtkimcontextxim.c index 680a6396a9..76543d9622 100644 --- a/modules/input/gtkimcontextxim.c +++ b/modules/input/gtkimcontextxim.c @@ -1300,8 +1300,6 @@ status_window_has_text (GtkWidget *status_window) static void status_window_show (GtkIMContextXIM *context_xim) { - GtkWidget *status_window = status_window_get (context_xim, TRUE); - context_xim->status_visible = TRUE; } @@ -1311,8 +1309,9 @@ status_window_hide (GtkIMContextXIM *context_xim) GtkWidget *status_window = status_window_get (context_xim, FALSE); context_xim->status_visible = FALSE; - - status_window_set_text (context_xim, ""); + + if (status_window) + status_window_set_text (context_xim, ""); } static void