rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Added fake drag file list #4584

This commit is contained in:
Jerry (Xinyu Hou) 2015-06-03 16:17:26 -07:00
parent 4508e10186
commit d9684d44d2
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,7 +84,7 @@ ClientProxy1_5::fileChunkReceived()
m_events->addEvent(Event(m_events->forIScreen().fileRecieveCompleted(), server));
}
else if (result == kStart) {
String filename = server->getDragFileList().at(0).getFilename();
String filename = server->getFakeDragFileList().at(0).getFilename();
LOG((CLOG_NOTIFY "File Transmission Started: Start receiving %s.", filename.c_str()));
}
}

6
src/lib/server/Server.cpp
View File

@ -2070,7 +2070,7 @@ Server::writeToDropDirThread(void*)
ARCH->sleep(.1f);
}
DropHelper::writeToDir(m_screen->getDropTarget(), m_dragFileList,
DropHelper::writeToDir(m_screen->getDropTarget(), m_fakeDragFileList,
m_receivedFileData);
}
@ -2387,7 +2387,7 @@ Server::dragInfoReceived(UInt32 fileNum, String content)
return;
}
DragInformation::parseDragInfo(m_dragFileList, fileNum, content);
DragInformation::parseDragInfo(m_fakeDragFileList, fileNum, content);
m_screen->startDraggingFiles(m_dragFileList);
m_screen->startDraggingFiles(m_fakeDragFileList);
}

5
src/lib/server/Server.h
View File

@ -175,8 +175,8 @@ public:
//! Return received file data
String& getReceivedFileData() { return m_receivedFileData; }
//! Return drag file list
DragFileList getDragFileList() { return m_dragFileList; }
//! Return fake drag file list
DragFileList getFakeDragFileList() { return m_fakeDragFileList; }
//@}
@ -470,6 +470,7 @@ private:
size_t m_expectedFileSize;
String m_receivedFileData;
DragFileList m_dragFileList;
DragFileList m_fakeDragFileList;
Thread* m_sendFileThread;
Thread* m_writeToDropDirThread;
String m_dragFileExt;