7 files changed, 21 insertions, 12 deletions
diff --git a/cmake/Modules/CMakeMacroLibtoolFile.cmake b/cmake/Modules/CMakeMacroLibtoolFile.cmake
index 12ba9909..1c7cb93d 100644
--- a/cmake/Modules/CMakeMacroLibtoolFile.cmake
+++ b/cmake/Modules/CMakeMacroLibtoolFile.cmake
@@ -180,8 +180,10 @@ function(libtool_generate_control_file _target)
   file(APPEND ${_laname} "libdir='/usr/lib'\n\n")
 
   # Make sure the timestamp is updated to trigger other make invocations
-  add_custom_command(OUTPUT "${_laname}" DEPENDS ${_target}
+  set(_lamarker ${_binary_dir}/.${_lname}.la.fresh)
+  add_custom_command(OUTPUT "${_lamarker}" DEPENDS ${_target}
     COMMENT "Updating timestamp on ${_lname}.la"
+    COMMAND "${CMAKE_COMMAND}" -E touch "${_lamarker}"
     COMMAND "${CMAKE_COMMAND}" -E touch "${_laname}")
 
   # Add custom command to symlink the static library so that autotools finds
@@ -193,5 +195,5 @@ function(libtool_generate_control_file _target)
     COMMAND "${CMAKE_COMMAND}" -E create_symlink ../${_lname}${CMAKE_STATIC_LIBRARY_SUFFIX} "${_libname}")
 
   add_custom_target(${_target}.la ALL
-    DEPENDS "${_laname}" "${_libname}")
+    DEPENDS "${_lamarker}" "${_libname}")
 endfunction()
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
diff --git a/vncviewer/UserDialog.cxx b/vncviewer/UserDialog.cxx
index 2c8d8474..c6cc02f7 100644
--- a/vncviewer/UserDialog.cxx
+++ b/vncviewer/UserDialog.cxx
@@ -59,6 +59,9 @@ using namespace rfb;
 static Fl_Pixmap secure_icon(secure);
 static Fl_Pixmap insecure_icon(insecure);
 
+std::string UserDialog::savedUsername;
+std::string UserDialog::savedPassword;
+
 static long ret_val = 0;
 
 static void button_cb(Fl_Widget *widget, long val) {
diff --git a/vncviewer/UserDialog.h b/vncviewer/UserDialog.h
index c16923c1..ddafbc3c 100644
--- a/vncviewer/UserDialog.h
+++ b/vncviewer/UserDialog.h
@@ -38,8 +38,8 @@ public:
   void resetPassword();
 
 private:
-  std::string savedUsername;
-  std::string savedPassword;
+  static std::string savedUsername;
+  static std::string savedPassword;
 };
 
 #endif