From 365a22c63cb292ea494f39ebc48a37e322e5eb14 Mon Sep 17 00:00:00 2001 From: runge Date: Tue, 21 Dec 2010 12:04:02 -0500 Subject: x11vnc: touchscreen uinput support and Java viewer mousewheel support. See x11vnc/ChangeLog for rest. --- x11vnc/gui.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'x11vnc/gui.c') diff --git a/x11vnc/gui.c b/x11vnc/gui.c index e264385..6101adb 100644 --- a/x11vnc/gui.c +++ b/x11vnc/gui.c @@ -81,26 +81,26 @@ static Window tweak_tk_window_id(Window win) { return None; #else char *name = NULL; - Window parent, new; + Window parent, new_win; if (getenv("NO_TWEAK_TK_WINDOW_ID")) { return win; } /* hack for tk, does not report outermost window */ - new = win; + new_win = win; parent = parent_window(win, &name); if (parent && name != NULL) { lowercase(name); if (strstr(name, "wish") || strstr(name, "x11vnc")) { - new = parent; + new_win = parent; rfbLog("tray_embed: using parent: %s\n", name); } } if (name != NULL) { XFree_wr(name); } - return new; + return new_win; #endif /* NO_X11 */ } -- cgit v1.2.1