summaryrefslogtreecommitdiff
path: root/modules/input
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2002-12-15 03:11:40 +0000
committerOwen Taylor <otaylor@src.gnome.org>2002-12-15 03:11:40 +0000
commitaeb608afeccb71b6d649b4560c28a580e7f50353 (patch)
treee232693020c249d1f4f6cb7db5482beb41ee77c7 /modules/input
parent8ba71578f2898d10641053cc089860b2b8d07266 (diff)
downloadgtk+-aeb608afeccb71b6d649b4560c28a580e7f50353.tar.gz
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)
Diffstat (limited to 'modules/input')
-rw-r--r--modules/input/gtkimcontextxim.c7
1 files changed, 3 insertions, 4 deletions
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