From d83cb23cc7ead0df253820096e0fcaf8734b3cfe Mon Sep 17 00:00:00 2001
From: "Jerry (Xinyu Hou)" <xinyu@synergy-project.org>
Date: Tue, 26 May 2015 17:25:18 -0700
Subject: [PATCH] Reverted 8b9758 #4712

---
 src/lib/server/ClientListener.h   | 3 ---
 src/lib/server/ClientProxy1_6.cpp | 8 ++------
 src/lib/server/Server.cpp         | 6 ------
 src/lib/server/Server.h           | 3 ---
 4 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/src/lib/server/ClientListener.h b/src/lib/server/ClientListener.h
index 70ecb2eb..c0b35ab3 100644
--- a/src/lib/server/ClientListener.h
+++ b/src/lib/server/ClientListener.h
@@ -64,9 +64,6 @@ public:
 	//! Get server which owns this listener
 	Server*				getServer() { return m_server; }
 
-	//! Return true if using secure network connection
-	bool				isSecure() { return m_useSecureNetwork; }
-
 	//@}
 
 private:
diff --git a/src/lib/server/ClientProxy1_6.cpp b/src/lib/server/ClientProxy1_6.cpp
index 79d890c6..8b429cca 100644
--- a/src/lib/server/ClientProxy1_6.cpp
+++ b/src/lib/server/ClientProxy1_6.cpp
@@ -29,11 +29,6 @@
 // ClientProxy1_6
 //
 
-enum
-{
-	kSslClipboardMaxSize = 1024
-};
-
 ClientProxy1_6::ClientProxy1_6(const String& name, synergy::IStream* stream, Server* server, IEventQueue* events) :
 	ClientProxy1_5(name, stream, server, events),
 	m_events(events)
@@ -61,8 +56,9 @@ ClientProxy1_6::setClipboard(ClipboardID id, const IClipboard* clipboard)
 
 		size_t size = data.size();
 		LOG((CLOG_DEBUG "sending clipboard %d to \"%s\"", id, getName().c_str()));
-		
+
 		StreamChunker::sendClipboard(data, size, id, 0, m_events, this);
+
 		LOG((CLOG_DEBUG "sent clipboard size=%d", size));
 	}
 }
diff --git a/src/lib/server/Server.cpp b/src/lib/server/Server.cpp
index 8b7c4afd..832a03b0 100644
--- a/src/lib/server/Server.cpp
+++ b/src/lib/server/Server.cpp
@@ -2389,9 +2389,3 @@ Server::dragInfoReceived(UInt32 fileNum, String content)
 
 	m_screen->startDraggingFiles(m_dragFileList);
 }
-
-bool
-Server::isSecure() const
-{
-	return m_clientListener->isSecure();
-}
diff --git a/src/lib/server/Server.h b/src/lib/server/Server.h
index 63551efa..d85a113d 100644
--- a/src/lib/server/Server.h
+++ b/src/lib/server/Server.h
@@ -175,9 +175,6 @@ public:
 	//! Return received file data
 	String&				getReceivedFileData() { return m_receivedFileData; }
 
-	//! Return true if using secure network connection
-	bool				isSecure() const;
-
 	//@}
 
 private: