Update upstream source from tag 'upstream/2.4.0+dfsg'

Update to upstream version '2.4.0+dfsg'
with Debian dir 4b6668cc08c7b0e56b1e1f7b4e89ecdb316182a0

1 files changed, 13 insertions, 13 deletions

diff --git a/src/lib/server/Server.h b/src/lib/server/Server.h
index bfd0a7d..ae8b2bd 100644
--- a/src/lib/server/Server.h
+++ b/src/lib/server/Server.h
@@ -2,11 +2,11 @@
  * barrier -- mouse and keyboard sharing utility
  * Copyright (C) 2012-2016 Symless Ltd.
  * Copyright (C) 2002 Chris Schoeneman
- * 
+ *
  * This package is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * found in the file LICENSE that should have accompanied this file.
- * 
+ *
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -110,7 +110,7 @@ public:
         barrier::Screen* screen, IEventQueue* events, ServerArgs const& args);
     ~Server();
 
-#ifdef TEST_ENV
+#ifdef BARRIER_TEST_ENV
     Server() : m_mock(true), m_config(NULL) { }
     void setActive(BaseClientProxy* active) {    m_active = active; }
 #endif
@@ -150,7 +150,7 @@ public:
 
     //! Store ClientListener pointer
     void                setListener(ClientListener* p) { m_clientListener = p; }
-    
+
     //@}
     //! @name accessors
     //@{
@@ -166,8 +166,8 @@ public:
     Set the \c list to the names of the currently connected clients.
     */
     void getClients(std::vector<std::string>& list) const;
-    
-    //! Return true if recieved file size is valid
+
+    //! Return true if received file size is valid
     bool                isReceivedFileSizeValid();
 
     //! Return expected file data size
@@ -356,15 +356,15 @@ private:
 
     // force the cursor off of \p client
     void                forceLeaveClient(BaseClientProxy* client);
-    
-    // thread funciton for sending file
-    void                sendFileThread(void*);
-    
+
+    // thread function for sending file
+    void send_file_thread(const char* filename);
+
     // thread function for writing file to drop directory
-    void                writeToDropDirThread(void*);
+    void write_to_drop_dir_thread();
 
     // thread function for sending drag information
-    void                sendDragInfoThread(void*);
+    void send_drag_info_thread(BaseClientProxy* newScreen);
 
     // send drag info to new client screen
     void                sendDragInfo(BaseClientProxy* newScreen);
@@ -448,7 +448,7 @@ private:
     bool                m_switchNeedsShift;
     bool                m_switchNeedsControl;
     bool                m_switchNeedsAlt;
-    
+
     // relative mouse move option
     bool                m_relativeMoves;