diff options
| author | runge <[email protected]> | 2010-12-21 12:04:02 -0500 |
|---|---|---|
| committer | runge <[email protected]> | 2010-12-21 12:04:02 -0500 |
| commit | 365a22c63cb292ea494f39ebc48a37e322e5eb14 (patch) | |
| tree | ca6e87ab396ee00a837b09b2c6cede62aec69dae /x11vnc/gui.c | |
| parent | d4fabc217e8cd02aca4d248229bb8a030b2bbfe2 (diff) | |
| download | libtdevnc-365a22c63cb292ea494f39ebc48a37e322e5eb14.tar.gz libtdevnc-365a22c63cb292ea494f39ebc48a37e322e5eb14.zip | |
x11vnc: touchscreen uinput support and Java viewer mousewheel support. See x11vnc/ChangeLog for rest.
Diffstat (limited to 'x11vnc/gui.c')
| -rw-r--r-- | x11vnc/gui.c | 8 |
1 files changed, 4 insertions, 4 deletions
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 */ } |