diff options
author | runge <runge@karlrunge.com> | 2009-12-28 11:21:50 -0500 |
---|---|---|
committer | runge <runge@karlrunge.com> | 2009-12-28 11:21:50 -0500 |
commit | 5764cd3fdd669096a84c7e40a2893cd45df090e4 (patch) | |
tree | e82be24266b1691941182f0bedecf41cac83cfb4 /x11vnc/appshare.c | |
parent | 018f152bc5c99503d1f59b073046b2f5dca9b042 (diff) | |
download | libtdevnc-5764cd3fdd669096a84c7e40a2893cd45df090e4.tar.gz libtdevnc-5764cd3fdd669096a84c7e40a2893cd45df090e4.zip |
x11vnc: Fix problems in --without-x builds. Fix crash
with -QD query for dbus info. Adjust window size for
small screens in -gui. Improve F1 help for xdm, etc.
include ssvnc 1.0.25 source.
Diffstat (limited to 'x11vnc/appshare.c')
-rw-r--r-- | x11vnc/appshare.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/x11vnc/appshare.c b/x11vnc/appshare.c index 81d9949..f9cc8f3 100644 --- a/x11vnc/appshare.c +++ b/x11vnc/appshare.c @@ -563,6 +563,9 @@ static void be_helper_pid(char *dpy_str) { if (ms < 50) ms = 50; +#if NO_X11 + fprintf(stderr, "be_helper_pid: not compiled with X11.\n"); +#else dpy = XOpenDisplay(dpy_str); ticker_atom = XInternAtom(dpy, ticker_atom_str, False); @@ -583,6 +586,7 @@ static void be_helper_pid(char *dpy_str) { } } } +#endif exit(0); } @@ -895,7 +899,7 @@ static void delete_win(Window win) { static void recurse_search(int level, int level_max, Window top, Window app, int *nw) { Window w, r, parent, *list = NULL; unsigned int nchild; - int ok; + int ok = 0; if (appshare_debug > 1) { fprintf(stderr, "level: %d level_max: %d top: 0x%lx app: 0x%lx\n", level, level_max, top, app); @@ -904,6 +908,7 @@ static void recurse_search(int level, int level_max, Window top, Window app, int return; } +#if !NO_X11 ok = XQueryTree(dpy, top, &r, &parent, &list, &nchild); if (ok) { int i; @@ -930,6 +935,7 @@ static void recurse_search(int level, int level_max, Window top, Window app, int if (list) { XFree(list); } +#endif } static void add_app(Window app) { |