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)
This commit is contained in:
Owen Taylor 2002-12-15 03:11:40 +00:00 committed by Owen Taylor
parent 8ba71578f2
commit aeb608afec
7 changed files with 63 additions and 4 deletions

View File

@ -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:

View File

@ -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:

View File

@ -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:

View File

@ -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:

View File

@ -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:

View File

@ -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:

View File

@ -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;
}
@ -1312,7 +1310,8 @@ status_window_hide (GtkIMContextXIM *context_xim)
context_xim->status_visible = FALSE;
status_window_set_text (context_xim, "");
if (status_window)
status_window_set_text (context_xim, "");
}
static void