made drag info function name more consistent

src/lib/client/Client.cpp

@@ -833,7 +833,7 @@ CClient::sendFileThread(void* filename)
 }
 
 void
-CClient::draggingInfoSending(UInt32 fileCount, CString& fileList, size_t size)
+CClient::sendDragInfo(UInt32 fileCount, CString& fileList, size_t size)
 {
-	m_server->draggingInfoSending(fileCount, fileList.c_str(), size);
+	m_server->sendDragInfo(fileCount, fileList.c_str(), size);
 }

src/lib/client/Client.h

@@ -114,7 +114,7 @@ public:
 	void				setFileTransferDes(CString& des) { m_fileTransferDes = des; }
 	
 	//! Send dragging file information back to server
-	void				draggingInfoSending(UInt32 fileCount, CString& fileList, size_t size);
+	void				sendDragInfo(UInt32 fileCount, CString& fileList, size_t size);
 	
 	//@}
 	//! @name accessors

src/lib/client/ServerProxy.cpp

@@ -949,7 +949,7 @@ CServerProxy::fileChunkSending(UInt8 mark, char* data, size_t dataSize)
 }
 
 void
-CServerProxy::draggingInfoSending(UInt32 fileCount, const char* data, size_t dataSize)
+CServerProxy::sendDragInfo(UInt32 fileCount, const char* data, size_t dataSize)
 {
 	CString info(data, dataSize);
 	CProtocolUtil::writef(m_stream, kMsgDDragInfo, fileCount, &info);

src/lib/client/ServerProxy.h

@@ -58,7 +58,7 @@ public:
 	void				fileChunkSending(UInt8 mark, char* data, size_t dataSize);
 
 	// sending dragging information to server
-	void				draggingInfoSending(UInt32 fileCount, const char* data, size_t dataSize);
+	void				sendDragInfo(UInt32 fileCount, const char* data, size_t dataSize);
 	
 #ifdef TEST_ENV
 	void				handleDataForTest() { handleData(CEvent(), NULL); }

src/lib/platform/MSWindowsScreen.cpp

@@ -378,7 +378,7 @@ CMSWindowsScreen::sendDragThread(void*)
 		CClient* client = app.getClientPtr();
 		UInt32 fileCount = 1;
 		LOG((CLOG_DEBUG "send dragging info to server: %s", draggingFilename.c_str()));
-		client->draggingInfoSending(fileCount, draggingFilename, size);
+		client->sendDragInfo(fileCount, draggingFilename, size);
 		LOG((CLOG_DEBUG "send dragging file to server"));
 		client->sendFileToServer(draggingFilename.c_str());
 	}

src/lib/platform/OSXScreen.cpp

@@ -922,7 +922,7 @@ COSXScreen::leave()
 				CClientApp& app = CClientApp::instance();
 				CClient* client = app.getClientPtr();
 				UInt32 fileCount = 1;
-				client->draggingInfoSending(fileCount, fileList, size);
+				client->sendDragInfo(fileCount, fileList, size);
 				LOG((CLOG_DEBUG "send dragging file to server"));
 				client->sendFileToServer(fileList.c_str());
 			}

src/lib/server/BaseClientProxy.h

@@ -78,7 +78,7 @@ public:
 	virtual void		screensaver(bool activate) = 0;
 	virtual void		resetOptions() = 0;
 	virtual void		setOptions(const COptionsList& options) = 0;
-	virtual void		draggingInfoSending(UInt32 fileCount, const char* data, size_t dataSize) = 0;
+	virtual void		sendDragInfo(UInt32 fileCount, const char* data, size_t dataSize) = 0;
 	virtual void		fileChunkSending(UInt8 mark, char* data, size_t dataSize) = 0;
 	virtual CString		getName() const;
 

src/lib/server/ClientProxy.h

@@ -83,7 +83,7 @@ public:
 	virtual void		screensaver(bool activate) = 0;
 	virtual void		resetOptions() = 0;
 	virtual void		setOptions(const COptionsList& options) = 0;
-	virtual void		draggingInfoSending(UInt32 fileCount, const char* data, size_t dataSize) = 0;
+	virtual void		sendDragInfo(UInt32 fileCount, const char* data, size_t dataSize) = 0;
 	virtual void		fileChunkSending(UInt8 mark, char* data, size_t dataSize) = 0;
 
 private:

src/lib/server/ClientProxy1_0.cpp

@@ -361,7 +361,7 @@ CClientProxy1_0::mouseWheel(SInt32, SInt32 yDelta)
 }
 
 void
-CClientProxy1_0::draggingInfoSending(UInt32 fileCount, const char* data, size_t dataSize)
+CClientProxy1_0::sendDragInfo(UInt32 fileCount, const char* data, size_t dataSize)
 {
 	// ignore -- not supported in protocol 1.0
 	LOG((CLOG_DEBUG "draggingInfoSending not supported"));

src/lib/server/ClientProxy1_0.h

@@ -58,7 +58,7 @@ public:
 	virtual void		screensaver(bool activate);
 	virtual void		resetOptions();
 	virtual void		setOptions(const COptionsList& options);
-	virtual void		draggingInfoSending(UInt32 fileCount, const char* data, size_t dataSize);
+	virtual void		sendDragInfo(UInt32 fileCount, const char* data, size_t dataSize);
 	virtual void		fileChunkSending(UInt8 mark, char* data, size_t dataSize);
 
 protected:

src/lib/server/ClientProxy1_5.cpp

@@ -42,7 +42,7 @@ CClientProxy1_5::~CClientProxy1_5()
 }
 
 void
-CClientProxy1_5::draggingInfoSending(UInt32 fileCount, const char* data, size_t dataSize)
+CClientProxy1_5::sendDragInfo(UInt32 fileCount, const char* data, size_t dataSize)
 {
 	CString info(data, dataSize);
 

src/lib/server/ClientProxy1_5.h

@@ -29,7 +29,7 @@ public:
 	CClientProxy1_5(const CString& name, synergy::IStream* adoptedStream, CServer* server, IEventQueue* events);
 	~CClientProxy1_5();
 
-	virtual void		draggingInfoSending(UInt32 fileCount, const char* data, size_t dataSize);
+	virtual void		sendDragInfo(UInt32 fileCount, const char* data, size_t dataSize);
 	virtual void		fileChunkSending(UInt8 mark, char* data, size_t dataSize);
 	virtual bool		parseMessage(const UInt8* code);
 	void				fileChunkReceived();

src/lib/server/PrimaryClient.cpp

@@ -250,7 +250,7 @@ CPrimaryClient::screensaver(bool)
 }
 
 void
-CPrimaryClient::draggingInfoSending(UInt32 fileCount, const char* data, size_t dataSize)
+CPrimaryClient::sendDragInfo(UInt32 fileCount, const char* data, size_t dataSize)
 {
 	// ignore
 }

src/lib/server/PrimaryClient.h

@@ -143,7 +143,7 @@ public:
 	virtual void		screensaver(bool activate);
 	virtual void		resetOptions();
 	virtual void		setOptions(const COptionsList& options);
-	virtual void		draggingInfoSending(UInt32 fileCount, const char* data, size_t dataSize);
+	virtual void		sendDragInfo(UInt32 fileCount, const char* data, size_t dataSize);
 	virtual void		fileChunkSending(UInt8 mark, char* data, size_t dataSize);
 
 private:

src/lib/server/Server.cpp

@@ -1833,7 +1833,7 @@ CServer::sendDragInfo(CBaseClientProxy* newScreen)
 		LOG((CLOG_DEBUG2 "sending drag information to client"));
 		LOG((CLOG_DEBUG3 "dragging file list: %s", fileList));
 		LOG((CLOG_DEBUG3 "dragging file list string size: %i", size));
-		newScreen->draggingInfoSending(fileCount, fileList, size);
+		newScreen->sendDragInfo(fileCount, fileList, size);
 	}
 }
 
@@ -2396,9 +2396,3 @@ CServer::dragInfoReceived(UInt32 fileNum, CString content)
 
 	m_screen->startDraggingFiles(m_dragFileList);
 }
-
-void
-CServer::draggingInfoSending(UInt32 fileCount, CString& fileList, size_t size)
-{
-	m_active->draggingInfoSending(fileCount, fileList.c_str(), size);
-}

src/lib/server/Server.h

@@ -157,9 +157,6 @@ public:
 	//! Received dragging information from client
 	void				dragInfoReceived(UInt32 fileNum, CString content);
 	
-	//! Send dragging file information to client
-	void				draggingInfoSending(UInt32 fileCount, CString& fileList, size_t size);
-	
 	//@}
 	//! @name accessors
 	//@{