Reverted 8b9758 #4712
This commit is contained in:
parent
907b02fb09
commit
d83cb23cc7
|
@ -64,9 +64,6 @@ public:
|
||||||
//! Get server which owns this listener
|
//! Get server which owns this listener
|
||||||
Server* getServer() { return m_server; }
|
Server* getServer() { return m_server; }
|
||||||
|
|
||||||
//! Return true if using secure network connection
|
|
||||||
bool isSecure() { return m_useSecureNetwork; }
|
|
||||||
|
|
||||||
//@}
|
//@}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
|
@ -29,11 +29,6 @@
|
||||||
// ClientProxy1_6
|
// ClientProxy1_6
|
||||||
//
|
//
|
||||||
|
|
||||||
enum
|
|
||||||
{
|
|
||||||
kSslClipboardMaxSize = 1024
|
|
||||||
};
|
|
||||||
|
|
||||||
ClientProxy1_6::ClientProxy1_6(const String& name, synergy::IStream* stream, Server* server, IEventQueue* events) :
|
ClientProxy1_6::ClientProxy1_6(const String& name, synergy::IStream* stream, Server* server, IEventQueue* events) :
|
||||||
ClientProxy1_5(name, stream, server, events),
|
ClientProxy1_5(name, stream, server, events),
|
||||||
m_events(events)
|
m_events(events)
|
||||||
|
@ -63,6 +58,7 @@ ClientProxy1_6::setClipboard(ClipboardID id, const IClipboard* clipboard)
|
||||||
LOG((CLOG_DEBUG "sending clipboard %d to \"%s\"", id, getName().c_str()));
|
LOG((CLOG_DEBUG "sending clipboard %d to \"%s\"", id, getName().c_str()));
|
||||||
|
|
||||||
StreamChunker::sendClipboard(data, size, id, 0, m_events, this);
|
StreamChunker::sendClipboard(data, size, id, 0, m_events, this);
|
||||||
|
|
||||||
LOG((CLOG_DEBUG "sent clipboard size=%d", size));
|
LOG((CLOG_DEBUG "sent clipboard size=%d", size));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -2389,9 +2389,3 @@ Server::dragInfoReceived(UInt32 fileNum, String content)
|
||||||
|
|
||||||
m_screen->startDraggingFiles(m_dragFileList);
|
m_screen->startDraggingFiles(m_dragFileList);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool
|
|
||||||
Server::isSecure() const
|
|
||||||
{
|
|
||||||
return m_clientListener->isSecure();
|
|
||||||
}
|
|
||||||
|
|
|
@ -175,9 +175,6 @@ public:
|
||||||
//! Return received file data
|
//! Return received file data
|
||||||
String& getReceivedFileData() { return m_receivedFileData; }
|
String& getReceivedFileData() { return m_receivedFileData; }
|
||||||
|
|
||||||
//! Return true if using secure network connection
|
|
||||||
bool isSecure() const;
|
|
||||||
|
|
||||||
//@}
|
//@}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
Loading…
Reference in New Issue