summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Udaltsov <svu@gnome.org>2008-02-28 12:40:23 +0000
committerSergey Udaltsov <svu@gnome.org>2008-02-28 12:40:23 +0000
commit66191ea3615456a795e3740d10754cddfd6e5ed2 (patch)
tree59136138c7a646f99cda58e746aa29671d53d02f
parent87087a4fbb0beb1fc3b793f5540b758dc1ecda7f (diff)
downloadlibxklavier-66191ea3615456a795e3740d10754cddfd6e5ed2.tar.gz
fix for Xnest, b.g.o#516318
-rw-r--r--ChangeLog5
-rw-r--r--libxklavier/xklavier_util.c3
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index b597b2e..03fee9a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-28 svu
+
+ * libxklavier/xklavier_util.c: fix by Jens for Xnest issue,
+ http://bugzilla.gnome.org/show_bug.cgi?id=516318
+
2008-02-01 svu
* tests/test_monitor.c: C99 fix, by Jens
diff --git a/libxklavier/xklavier_util.c b/libxklavier/xklavier_util.c
index 06a115c..7f9fdbd 100644
--- a/libxklavier/xklavier_util.c
+++ b/libxklavier/xklavier_util.c
@@ -46,6 +46,9 @@ xkl_engine_get_window_title(XklEngine * engine, Window w)
unsigned long nitems, rest;
unsigned char *prop;
+ if (w == xkl_engine_priv(engine, root_window))
+ return g_strdup("ROOT");
+
if (Success ==
XGetWindowProperty(xkl_engine_get_display(engine), w,
xkl_engine_priv(engine, atoms)[WM_NAME], 0L,