From d4fe39c3f880b58f1e41ed25491116a891718eab Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Mon, 23 Sep 2002 16:27:12 +0000 Subject: [PATCH] Fix incorrect usage of gdk_get_default_root_window ()). (#92767) Mon Sep 23 12:24:14 2002 Owen Taylor * modules/input/gtkimcontextxim.c (status_window_get): Fix incorrect usage of gdk_get_default_root_window ()). (#92767) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ modules/input/gtkimcontextxim.c | 7 ++++++- 7 files changed, 42 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 49abf2430..3748df692 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Sep 23 12:24:14 2002 Owen Taylor + + * modules/input/gtkimcontextxim.c (status_window_get): + Fix incorrect usage of gdk_get_default_root_window ()). + (#92767) + Mon Sep 23 12:12:48 2002 Owen Taylor * gtk/gtkspinbutton.c: Patch from Joshua N Pritikin to diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 49abf2430..3748df692 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Mon Sep 23 12:24:14 2002 Owen Taylor + + * modules/input/gtkimcontextxim.c (status_window_get): + Fix incorrect usage of gdk_get_default_root_window ()). + (#92767) + Mon Sep 23 12:12:48 2002 Owen Taylor * gtk/gtkspinbutton.c: Patch from Joshua N Pritikin to diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 49abf2430..3748df692 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Mon Sep 23 12:24:14 2002 Owen Taylor + + * modules/input/gtkimcontextxim.c (status_window_get): + Fix incorrect usage of gdk_get_default_root_window ()). + (#92767) + Mon Sep 23 12:12:48 2002 Owen Taylor * gtk/gtkspinbutton.c: Patch from Joshua N Pritikin to diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 49abf2430..3748df692 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Mon Sep 23 12:24:14 2002 Owen Taylor + + * modules/input/gtkimcontextxim.c (status_window_get): + Fix incorrect usage of gdk_get_default_root_window ()). + (#92767) + Mon Sep 23 12:12:48 2002 Owen Taylor * gtk/gtkspinbutton.c: Patch from Joshua N Pritikin to diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 49abf2430..3748df692 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Mon Sep 23 12:24:14 2002 Owen Taylor + + * modules/input/gtkimcontextxim.c (status_window_get): + Fix incorrect usage of gdk_get_default_root_window ()). + (#92767) + Mon Sep 23 12:12:48 2002 Owen Taylor * gtk/gtkspinbutton.c: Patch from Joshua N Pritikin to diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 49abf2430..3748df692 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Mon Sep 23 12:24:14 2002 Owen Taylor + + * modules/input/gtkimcontextxim.c (status_window_get): + Fix incorrect usage of gdk_get_default_root_window ()). + (#92767) + Mon Sep 23 12:12:48 2002 Owen Taylor * gtk/gtkspinbutton.c: Patch from Joshua N Pritikin to diff --git a/modules/input/gtkimcontextxim.c b/modules/input/gtkimcontextxim.c index f11517477..cafc911e2 100644 --- a/modules/input/gtkimcontextxim.c +++ b/modules/input/gtkimcontextxim.c @@ -1045,15 +1045,20 @@ status_window_get (GtkIMContextXIM *context_xim, GtkWidget *window; StatusWindow *status_window; GtkWidget *status_label; + GdkScreen *screen; + GdkWindow *root_window; if (!context_xim->client_window) return NULL; toplevel_gdk = context_xim->client_window; + screen = gdk_drawable_get_screen (toplevel_gdk); + root_window = gdk_screen_get_root_window (screen); + while (TRUE) { GdkWindow *parent = gdk_window_get_parent (toplevel_gdk); - if (parent == gdk_get_default_root_window ()) + if (parent == root_window) break; else toplevel_gdk = parent;