diff options
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/tx/TXWindow.cxx | 1 | ||||
| -rw-r--r-- | unix/x0vncserver/XSelection.cxx | 2 | ||||
| -rw-r--r-- | unix/xserver/hw/vnc/Makefile.am | 13 | ||||
| -rw-r--r-- | unix/xserver/hw/vnc/Xvnc.man | 4 |
4 files changed, 12 insertions, 8 deletions
diff --git a/unix/tx/TXWindow.cxx b/unix/tx/TXWindow.cxx index b6a29d67..639c1382 100644 --- a/unix/tx/TXWindow.cxx +++ b/unix/tx/TXWindow.cxx @@ -313,6 +313,7 @@ void TXWindow::toplevel(const char* name, TXDeleteWindowCallback* dwc_, void TXWindow::setName(const char* name) { XClassHint classHint; + memset(&classHint, 0, sizeof(classHint)); XGetClassHint(dpy, win(), &classHint); XFree(classHint.res_name); classHint.res_name = (char*)name; diff --git a/unix/x0vncserver/XSelection.cxx b/unix/x0vncserver/XSelection.cxx index 72dd537f..c724d2ac 100644 --- a/unix/x0vncserver/XSelection.cxx +++ b/unix/x0vncserver/XSelection.cxx @@ -37,7 +37,7 @@ XSelection::XSelection(Display* dpy_, XSelectionHandler* handler_) probeProperty = XInternAtom(dpy, "TigerVNC_ProbeProperty", False); transferProperty = XInternAtom(dpy, "TigerVNC_TransferProperty", False); timestampProperty = XInternAtom(dpy, "TigerVNC_TimestampProperty", False); - setName("TigerVNC Clipboard (x0vncserver)"); + toplevel("TigerVNC Clipboard (x0vncserver)"); addEventMask(PropertyChangeMask); // Required for PropertyNotify events } diff --git a/unix/xserver/hw/vnc/Makefile.am b/unix/xserver/hw/vnc/Makefile.am index caf3b948..4049bafa 100644 --- a/unix/xserver/hw/vnc/Makefile.am +++ b/unix/xserver/hw/vnc/Makefile.am @@ -1,11 +1,14 @@ TIGERVNC_SRCDIR=${top_srcdir}/../.. TIGERVNC_BUILDDIR=${TIGERVNC_SRCDIR} -RFB_LIB=$(TIGERVNC_BUILDDIR)/common/rfb/librfb.la -RDR_LIB=$(TIGERVNC_BUILDDIR)/common/rdr/librdr.la -OS_LIB=$(TIGERVNC_BUILDDIR)/common/os/libos.la -NETWORK_LIB=$(TIGERVNC_BUILDDIR)/common/network/libnetwork.la -UNIXCOMMON_LIB=$(TIGERVNC_BUILDDIR)/unix/common/libunixcommon.la +# FIXME: We add an extra / to the paths to trick libtool in to adding +# the libraries twice, to work around the dependency cycles we +# have +RFB_LIB=$(TIGERVNC_BUILDDIR)//common/rfb/librfb.la +RDR_LIB=$(TIGERVNC_BUILDDIR)//common/rdr/librdr.la +OS_LIB=$(TIGERVNC_BUILDDIR)//common/os/libos.la +NETWORK_LIB=$(TIGERVNC_BUILDDIR)//common/network/libnetwork.la +UNIXCOMMON_LIB=$(TIGERVNC_BUILDDIR)//unix/common/libunixcommon.la COMMON_LIBS=$(NETWORK_LIB) $(RFB_LIB) $(RDR_LIB) $(OS_LIB) $(UNIXCOMMON_LIB) AM_CPPFLAGS = \ diff --git a/unix/xserver/hw/vnc/Xvnc.man b/unix/xserver/hw/vnc/Xvnc.man index b9c429f7..a5659e7d 100644 --- a/unix/xserver/hw/vnc/Xvnc.man +++ b/unix/xserver/hw/vnc/Xvnc.man @@ -361,8 +361,8 @@ localhost -once securitytypes=none In this example a viewer connection to :50 will result in a new Xvnc for that connection which should display the standard XDM login screen on that machine. -Because the user needs to login via XDM, it is usually OK to accept connections -without a VNC password in this case. +It is usually OK to accept connections without a VNC password, since the user +still needs to log in via XDM in this case. In the wait mode, when the first connection comes in, inetd gives the listening socket to Xvnc. This means that for a given TCP port, there is only ever one |