Don't call status_window_set_text() if the status window doesn't already

Sat Dec 14 22:03:21 2002  Owen Taylor  <otaylor@redhat.com>

	* 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)

diff --git a/ChangeLog b/ChangeLog
index c462519c05a470ebea28132fee73c6c74766672d..3babe4d2123aef24f7f3f364528e7927f0f1c793 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Sat Dec 14 22:03:21 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <maclas@gmx.de>
 
        * gtk/gtkcalendar.c:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c462519c05a470ebea28132fee73c6c74766672d..3babe4d2123aef24f7f3f364528e7927f0f1c793 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,13 @@
+Sat Dec 14 22:03:21 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <maclas@gmx.de>
 
        * gtk/gtkcalendar.c:

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index c462519c05a470ebea28132fee73c6c74766672d..3babe4d2123aef24f7f3f364528e7927f0f1c793 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,13 @@
+Sat Dec 14 22:03:21 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <maclas@gmx.de>
 
        * gtk/gtkcalendar.c:

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index c462519c05a470ebea28132fee73c6c74766672d..3babe4d2123aef24f7f3f364528e7927f0f1c793 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,13 @@
+Sat Dec 14 22:03:21 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <maclas@gmx.de>
 
        * gtk/gtkcalendar.c:

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index c462519c05a470ebea28132fee73c6c74766672d..3babe4d2123aef24f7f3f364528e7927f0f1c793 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,13 @@
+Sat Dec 14 22:03:21 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <maclas@gmx.de>
 
        * gtk/gtkcalendar.c:

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index c462519c05a470ebea28132fee73c6c74766672d..3babe4d2123aef24f7f3f364528e7927f0f1c793 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,13 @@
+Sat Dec 14 22:03:21 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * 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  <maclas@gmx.de>
 
        * gtk/gtkcalendar.c:

diff --git a/modules/input/gtkimcontextxim.c b/modules/input/gtkimcontextxim.c
index 680a6396a9d92db07527516910a6739596117981..76543d96220a3ab6fb703cd5d967f7fb7a11597f 100644 (file)
--- 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