Added methods for processing file transfer message FileListData.

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@408 3789f03b-4d11-0410-bbf8-ca57d06f2519

diff --git a/rfb/CMsgHandler.h b/rfb/CMsgHandler.h
index 7a69f145b423a0af53ed18329fa0040a67599ba8..68e5e861dd1231090eb2354385afccc0d11bc4c6 100644 (file)
--- a/rfb/CMsgHandler.h
+++ b/rfb/CMsgHandler.h
@@ -56,6 +56,8 @@ namespace rfb {
     virtual void imageRect(const Rect& r, void* pixels);
     virtual void copyRect(const Rect& r, int srcX, int srcY);
 
+    virtual bool processFTMsg(int type) = 0;
+
     ConnParams cp;
   };
 }

diff --git a/rfb/CMsgReaderV3.cxx b/rfb/CMsgReaderV3.cxx
index 59519813bee769cbd859e88ef84ca2d019d4acc6..b8242a0241a38538528fc1529909dbe2a3d57c7c 100644 (file)
--- a/rfb/CMsgReaderV3.cxx
+++ b/rfb/CMsgReaderV3.cxx
@@ -58,6 +58,8 @@ void CMsgReaderV3::readMsg()
     case msgTypeSetColourMapEntries: readSetColourMapEntries(); break;
     case msgTypeBell:                readBell(); break;
     case msgTypeServerCutText:       readServerCutText(); break;
+    case msgTypeFileListData:
+      handler->processFTMsg(type); break;
     default:
       fprintf(stderr, "unknown message type %d\n", type);
       throw Exception("unknown message type");

diff --git a/vncviewer/FileTransfer.cxx b/vncviewer/FileTransfer.cxx
index 937dd26cf1f38aa765b4a11518a7a89484026e40..77ebe0a854c4a8bc0d5534c159896a1ed768f951 100644 (file)
--- a/vncviewer/FileTransfer.cxx
+++ b/vncviewer/FileTransfer.cxx
@@ -69,7 +69,7 @@ FileTransfer::show()
 bool
 FileTransfer::processFTMsg(int type)
 {
-  if (m_bInitialized) return false;
+  if (!m_bInitialized) return false;
 
   switch (type)
   {

diff --git a/vncviewer/cview.cxx b/vncviewer/cview.cxx
index 5f5d02e91067c67796b89854b99ebd227a431204..47018017ec4b1effaf5e4195f3ba9ff98eea28c6 100644 (file)
--- a/vncviewer/cview.cxx
+++ b/vncviewer/cview.cxx
@@ -1705,3 +1705,7 @@ bool CView::getUserPasswd(char** user, char** password) {
   return true;
 }
 
+bool CView::processFTMsg(int type)
+{
+  return m_fileTransfer.processFTMsg(type);
+}
\ No newline at end of file

diff --git a/vncviewer/cview.h b/vncviewer/cview.h
index 4bbf296bf354584f9d1038caa091e604e5950929..d0b326889610fe8e209be0c979e9e79b0d903035 100644 (file)
--- a/vncviewer/cview.h
+++ b/vncviewer/cview.h
@@ -176,6 +176,8 @@ namespace rfb {
       // Global user-config registry key
       static RegKey userConfigKey;
 
+      bool processFTMsg(int type);
+
     protected:
 
       // Locally-rendered VNC cursor