commit da17d212b93629ab1f37ca9aba0493e787f79c7b
author Dennis Syrovatsky <dennis@tightvnc.com> Wed Nov 09 05:58:30 2005 +0000
committer Dennis Syrovatsky <dennis@tightvnc.com> Wed Nov 09 05:58:30 2005 +0000
tree cddc72f12dc61ea94db91911854a99fdfc6ba18a
parent 5c761177a55954bf405d3f7907c732272686d372

Added file transfers object to CView class.


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

vncviewer/FileTransfer.cxx

diff --git a/vncviewer/FileTransfer.cxx b/vncviewer/FileTransfer.cxx
index 64c48dd..5faef69 100644
--- a/vncviewer/FileTransfer.cxx
+++ b/vncviewer/FileTransfer.cxx
@@ -59,6 +59,8 @@
 bool 
 FileTransfer::create()
 {
+  if (!m_bInitialized) return false;
+
   m_bFTDlgShown = m_pFTDialog->createFTDialog();
   return m_bFTDlgShown;
 }

vncviewer/cview.cxx

diff --git a/vncviewer/cview.cxx b/vncviewer/cview.cxx
index 4a13c7b..306b1cd 100644
--- a/vncviewer/cview.cxx
+++ b/vncviewer/cview.cxx
@@ -316,6 +316,8 @@
   WSAAsyncSelect(s->getFd(), getHandle(), WM_USER, FD_READ | FD_CLOSE);
   sock = s;
 
+  m_fileTransfer.initialize(&s->inStream(), &s->outStream());
+
   return true;
 }
 
@@ -681,6 +683,7 @@
       AboutDialog::instance.showDialog();
       return 0;
     case IDM_FILE_TRANSFER:
+      m_fileTransfer.create();
       return 0;
     case IDM_CONN_SAVE_AS:
       return 0;

vncviewer/cview.h

diff --git a/vncviewer/cview.h b/vncviewer/cview.h
index f4b385b..4bbf296 100644
--- a/vncviewer/cview.h
+++ b/vncviewer/cview.h
@@ -42,6 +42,7 @@
 #include <vncviewer/ViewerToolBar.h>
 #include <vncviewer/CViewOptions.h>
 #include <vncviewer/CViewManager.h>
+#include <vncviewer/FileTransfer.h>
 #include <list>
 
 
@@ -295,6 +296,8 @@
       // Handle back to CViewManager instance, if any
       CViewManager* manager;
 
+      FileTransfer m_fileTransfer;
+
     };
 
   };