From 81649376fa486f39ecd8f751abb67620438a7c5b Mon Sep 17 00:00:00 2001 From: "Jerry (Xinyu Hou)" Date: Thu, 9 Jul 2015 13:46:17 -0700 Subject: [PATCH] Revert "Added symbolic link creation to linux and macos #4696" This reverts commit ad9cfd64af4f8f15623069c3381f78d7db13a734. Conflicts: src/gui/src/PluginManager.cpp --- src/lib/arch/unix/ArchLogUnix.cpp | 2 +- src/lib/client/Client.cpp | 2 +- src/lib/client/ServerProxy.cpp | 6 +++--- src/lib/server/ClientProxy1_5.cpp | 2 +- src/lib/server/ClientProxy1_6.cpp | 4 ++-- src/lib/synergy/ClipboardChunk.cpp | 4 ++-- src/lib/synergy/DropHelper.cpp | 6 +++--- src/lib/synergy/FileChunk.cpp | 2 +- src/lib/synergy/StreamChunker.cpp | 4 ++-- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/lib/arch/unix/ArchLogUnix.cpp b/src/lib/arch/unix/ArchLogUnix.cpp index 516ffa6a..a290463f 100644 --- a/src/lib/arch/unix/ArchLogUnix.cpp +++ b/src/lib/arch/unix/ArchLogUnix.cpp @@ -66,7 +66,7 @@ ArchLogUnix::writeLog(ELevel level, const char* msg) priority = LOG_WARNING; break; - case kNOTIFY: + case kNOTE: priority = LOG_NOTICE; break; diff --git a/src/lib/client/Client.cpp b/src/lib/client/Client.cpp index 5ba8b8e7..da8611d4 100644 --- a/src/lib/client/Client.cpp +++ b/src/lib/client/Client.cpp @@ -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; diff --git a/src/lib/client/ServerProxy.cpp b/src/lib/client/ServerProxy.cpp index 70a8b26c..ac01df35 100644 --- a/src/lib/client/ServerProxy.cpp +++ b/src/lib/client/ServerProxy.cpp @@ -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())); } } } diff --git a/src/lib/server/ClientProxy1_5.cpp b/src/lib/server/ClientProxy1_5.cpp index 2e98d771..09c85995 100644 --- a/src/lib/server/ClientProxy1_5.cpp +++ b/src/lib/server/ClientProxy1_5.cpp @@ -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())); } } } diff --git a/src/lib/server/ClientProxy1_6.cpp b/src/lib/server/ClientProxy1_6.cpp index 76234112..40c8eae8 100644 --- a/src/lib/server/ClientProxy1_6.cpp +++ b/src/lib/server/ClientProxy1_6.cpp @@ -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; diff --git a/src/lib/synergy/ClipboardChunk.cpp b/src/lib/synergy/ClipboardChunk.cpp index ef60954e..b17a52a1 100644 --- a/src/lib/synergy/ClipboardChunk.cpp +++ b/src/lib/synergy/ClipboardChunk.cpp @@ -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; } diff --git a/src/lib/synergy/DropHelper.cpp b/src/lib/synergy/DropHelper.cpp index 63170128..314f8d14 100644 --- a/src/lib/synergy/DropHelper.cpp +++ b/src/lib/synergy/DropHelper.cpp @@ -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")); } } diff --git a/src/lib/synergy/FileChunk.cpp b/src/lib/synergy/FileChunk.cpp index 21c91bca..441e1524 100644 --- a/src/lib/synergy/FileChunk.cpp +++ b/src/lib/synergy/FileChunk.cpp @@ -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; } diff --git a/src/lib/synergy/StreamChunker.cpp b/src/lib/synergy/StreamChunker.cpp index b23f4dbb..080938bf 100644 --- a/src/lib/synergy/StreamChunker.cpp +++ b/src/lib/synergy/StreamChunker.cpp @@ -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; }