--- sourceforge.net/trunk/rdesktop/xwin.c	2003/10/31 04:51:10	537
+++ sourceforge.net/trunk/rdesktop/xwin.c	2003/11/03 13:33:35	543
@@ -543,7 +543,7 @@
 		pixel |= *(data++);
 
 		value = make_colour(split_colour24(pixel));
-		
+
 		if (g_xserver_be)
 		{
 			*(out++) = value >> 16;
@@ -945,8 +945,6 @@
 void
 ui_destroy_window(void)
 {
-	ui_destroy_cursor(g_null_cursor);
-
 	if (g_IC != NULL)
 		XDestroyIC(g_IC);
 
@@ -990,9 +988,6 @@
 	key_translation tr;
 	char str[256];
 	Status status;
-	unsigned int state;
-	Window wdummy;
-	int dummy;
 
 	while (XPending(g_display) > 0)
 	{
@@ -1165,9 +1160,7 @@
 				if (xevent.xfocus.mode == NotifyGrab)
 					break;
 				g_focused = True;
-				XQueryPointer(g_display, g_wnd, &wdummy, &wdummy, &dummy, &dummy,
-					      &dummy, &dummy, &state);
-				reset_modifier_keys(state);
+				reset_modifier_keys();
 				if (g_grab_keyboard && g_mouse_in_wnd)
 					XGrabKeyboard(g_display, g_wnd, True,
 						      GrabModeAsync, GrabModeAsync, CurrentTime);