Revert "Added symbolic link creation to linux and macos #4696"
This reverts commit ad9cfd64af
.
Conflicts:
src/gui/src/PluginManager.cpp
This commit is contained in:
parent
a8cf9173c8
commit
81649376fa
|
@ -66,7 +66,7 @@ ArchLogUnix::writeLog(ELevel level, const char* msg)
|
|||
priority = LOG_WARNING;
|
||||
break;
|
||||
|
||||
case kNOTIFY:
|
||||
case kNOTE:
|
||||
priority = LOG_NOTICE;
|
||||
break;
|
||||
|
||||
|
|
|
@ -285,7 +285,7 @@ Client::leave()
|
|||
|
||||
if (!m_receivedFileData.empty()) {
|
||||
m_receivedFileData.clear();
|
||||
LOG((CLOG_NOTIFY "file transmission interrupted"));
|
||||
LOG((CLOG_DEBUG "file transmission interrupted"));
|
||||
}
|
||||
|
||||
return true;
|
||||
|
|
|
@ -565,11 +565,11 @@ ServerProxy::setClipboard()
|
|||
clipboard.unmarshall(dataCached, 0);
|
||||
m_client->setClipboard(id, &clipboard);
|
||||
|
||||
LOG((CLOG_NOTIFY "clipboard transmission complete"));
|
||||
LOG((CLOG_DEBUG "clipboard transmission complete"));
|
||||
}
|
||||
else if (r == kStart) {
|
||||
size_t size = ClipboardChunk::getExpectedSize();
|
||||
LOG((CLOG_NOTIFY "clipboard transmission started: start receiving %u bytes of clipboard data", size));
|
||||
LOG((CLOG_DEBUG "clipboard transmission started: start receiving %u bytes of clipboard data", size));
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -873,7 +873,7 @@ ServerProxy::fileChunkReceived()
|
|||
else if (result == kStart) {
|
||||
if (m_client->getDragFileList().size() > 0) {
|
||||
String filename = m_client->getDragFileList().at(0).getFilename();
|
||||
LOG((CLOG_NOTIFY "file transmission started: start receiving %s", filename.c_str()));
|
||||
LOG((CLOG_DEBUG "file transmission started: start receiving %s", filename.c_str()));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -93,7 +93,7 @@ ClientProxy1_5::fileChunkReceived()
|
|||
else if (result == kStart) {
|
||||
if (server->getFakeDragFileList().size() > 0) {
|
||||
String filename = server->getFakeDragFileList().at(0).getFilename();
|
||||
LOG((CLOG_NOTIFY "file transmission started: start receiving %s", filename.c_str()));
|
||||
LOG((CLOG_DEBUG "file transmission started: start receiving %s", filename.c_str()));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -91,11 +91,11 @@ ClientProxy1_6::recvClipboard()
|
|||
info->m_sequenceNumber = seq;
|
||||
m_events->addEvent(Event(m_events->forClipboard().clipboardChanged(),
|
||||
getEventTarget(), info));
|
||||
LOG((CLOG_NOTIFY "clipboard transmission complete"));
|
||||
LOG((CLOG_DEBUG "clipboard transmission complete"));
|
||||
}
|
||||
else if (r == kStart) {
|
||||
size_t size = ClipboardChunk::getExpectedSize();
|
||||
LOG((CLOG_NOTIFY "clipboard transmission started: start receiving %u bytes of clipboard data", size));
|
||||
LOG((CLOG_DEBUG "clipboard transmission started: start receiving %u bytes of clipboard data", size));
|
||||
}
|
||||
|
||||
return true;
|
||||
|
|
|
@ -115,13 +115,13 @@ ClipboardChunk::assemble(synergy::IStream* stream,
|
|||
}
|
||||
else if (s_expectedSize != dataCached.size()) {
|
||||
LOG((CLOG_ERR "corrupted clipboard data, expected size=%d actual size=%d", s_expectedSize, dataCached.size()));
|
||||
LOG((CLOG_NOTIFY "clipboard transmission failed: corrupted clipboard data"));
|
||||
LOG((CLOG_DEBUG "clipboard transmission failed: corrupted clipboard data"));
|
||||
return kError;
|
||||
}
|
||||
return kFinish;
|
||||
}
|
||||
|
||||
LOG((CLOG_NOTIFY "clipboard transmission failed: unknow error"));
|
||||
LOG((CLOG_DEBUG "clipboard transmission failed: unknow error"));
|
||||
return kError;
|
||||
}
|
||||
|
||||
|
|
|
@ -38,18 +38,18 @@ DropHelper::writeToDir(const String& destination, DragFileList& fileList, String
|
|||
file.open(dropTarget.c_str(), std::ios::out | std::ios::binary);
|
||||
if (!file.is_open()) {
|
||||
LOG((CLOG_ERR "drop file failed: can not open %s", dropTarget.c_str()));
|
||||
LOG((CLOG_NOTIFY "file transmission failed: can not open %s", dropTarget.c_str()));
|
||||
LOG((CLOG_DEBUG "file transmission failed: can not open %s", dropTarget.c_str()));
|
||||
}
|
||||
|
||||
file.write(data.c_str(), data.size());
|
||||
file.close();
|
||||
|
||||
LOG((CLOG_NOTIFY "file transmission complete: %s is saved to %s", fileList.at(0).getFilename().c_str(), destination.c_str()));
|
||||
LOG((CLOG_DEBUG "file transmission complete: %s is saved to %s", fileList.at(0).getFilename().c_str(), destination.c_str()));
|
||||
|
||||
fileList.clear();
|
||||
}
|
||||
else {
|
||||
LOG((CLOG_ERR "drop file failed: drop target is empty"));
|
||||
LOG((CLOG_NOTIFY "file transmission failed: drop target is empty"));
|
||||
LOG((CLOG_DEBUG "file transmission failed: drop target is empty"));
|
||||
}
|
||||
}
|
||||
|
|
|
@ -116,7 +116,7 @@ FileChunk::assemble(synergy::IStream* stream, String& dataReceived, size_t& expe
|
|||
case kDataEnd:
|
||||
if (expectedSize != dataReceived.size()) {
|
||||
LOG((CLOG_ERR "corrupted clipboard data, expected size=%d actual size=%d", expectedSize, dataReceived.size()));
|
||||
LOG((CLOG_NOTIFY "file transmission failed: corrupted file data"));
|
||||
LOG((CLOG_DEBUG "file transmission failed: corrupted file data"));
|
||||
return kError;
|
||||
}
|
||||
|
||||
|
|
|
@ -82,7 +82,7 @@ StreamChunker::sendFile(
|
|||
while (true) {
|
||||
if (s_interruptFile) {
|
||||
s_interruptFile = false;
|
||||
LOG((CLOG_NOTIFY "file transmission interrupted"));
|
||||
LOG((CLOG_DEBUG "file transmission interrupted"));
|
||||
break;
|
||||
}
|
||||
|
||||
|
@ -154,7 +154,7 @@ StreamChunker::sendClipboard(
|
|||
while (true) {
|
||||
if (s_interruptClipboard) {
|
||||
s_interruptClipboard = false;
|
||||
LOG((CLOG_NOTIFY "clipboard transmission interrupted"));
|
||||
LOG((CLOG_DEBUG "clipboard transmission interrupted"));
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue