--- libxklavier-2.1/libxklavier/xklavier_util.orig	Wed Feb 27 20:14:01 2008
+++ libxklavier-2.1/libxklavier/xklavier_util.c	Wed Feb 27 20:16:52 2008
@@ -114,7 +114,10 @@ xkl_get_debug_window_title(XklEngine * e
 	static gchar sname[33];
 	gchar *name;
 	strcpy(sname, "NULL");
-	if (win != (Window) NULL) {
+
+	if (win == (Window *) PointerRoot) {
+		strcpy(sname, "ROOT");
+	} else if (win != (Window *) None) {
 		name = xkl_engine_get_window_title(engine, win);
 		if (name != NULL) {
 			snprintf(sname, sizeof(sname), "%.32s", name);
--- libxklavier-2.1/libxklavier/xklavier_toplevel.orig	Wed Feb 27 20:36:09 2008
+++ libxklavier-2.1/libxklavier/xklavier_toplevel.c	Wed Feb 27 20:36:14 2008
@@ -205,6 +205,7 @@ xkl_engine_find_toplevel_window(XklEngin
 	gboolean rv;

 	if (win == (Window) NULL
+	    || win == (Window *) PointerRoot
 	    || win == xkl_engine_priv(engine, root_window)) {
 		*toplevel_win_out = (Window) NULL;
 		xkl_last_error_message = "The window is either 0 or root";