backup/barrier
1
0
Fork 0
mirror of https://github.com/debauchee/barrier.git synced 2026-07-05 19:36:16 +08:00
Code Issues Projects Releases Wiki Activity

Revert "Add keepAlive message before send file/clipboard data #4768"

Browse Source 
This reverts commit 5287c62540b277474603ea8a38c53b50cb8f4d52.
This commit is contained in:
Jerry (Xinyu Hou)
2015-12-08 12:27:55 -08:00
committed by Xinyu Hou
parent b5b2cdfade
commit 7cbd3fdcb4
7 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/lib/server/ClientProxy1_5.cpp
View File

@@ -35,10 +35,16 @@ ClientProxy1_5::ClientProxy1_5(const String& name, synergy::IStream* stream, Ser
ClientProxy1_4(name, stream, server, events),
m_events(events)
{
m_events->adoptHandler(m_events->forFile().keepAlive(),
this,
new TMethodEventJob<ClientProxy1_3>(this,
&ClientProxy1_3::handleKeepAlive, NULL));
}
ClientProxy1_5::~ClientProxy1_5()
{
m_events->removeHandler(m_events->forFile().keepAlive(), this);
}
void
@@ -52,7 +58,6 @@ ClientProxy1_5::sendDragInfo(UInt32 fileCount, const char* info, size_t size)
void
ClientProxy1_5::fileChunkSending(UInt8 mark, char* data, size_t dataSize)
{
keepAlive();
FileChunk::send(getStream(), mark, data, dataSize);
}

9
src/lib/server/ClientProxy1_6.cpp
View File

@@ -50,12 +50,6 @@ ClientProxy1_6::setClipboard(ClipboardID id, const IClipboard* clipboard)
if (m_clipboard[id].m_dirty) {
// this clipboard is now clean
m_clipboard[id].m_dirty = false;
// add keep alive message before we do clipboard copy
// in case there is a big data inside and time that would
// comsume will cause connecton being dropped
keepAlive();
Clipboard::copy(&m_clipboard[id].m_clipboard, clipboard);
String data = m_clipboard[id].m_clipboard.marshall();
@@ -72,9 +66,6 @@ ClientProxy1_6::setClipboard(ClipboardID id, const IClipboard* clipboard)
void
ClientProxy1_6::handleClipboardSendingEvent(const Event& event, void*)
{
// add keep alive message before we send each clipboard data
keepAlive();
ClipboardChunk::send(getStream(), event.getData());
}