commit f04f7eb204c321e97466f9efdf119825ef535903
author Dennis Syrovatsky <dennis@tightvnc.com> Mon May 22 08:14:52 2006 +0000
committer Dennis Syrovatsky <dennis@tightvnc.com> Mon May 22 08:14:52 2006 +0000
tree 476eae747df5af89992e81d08566c9a8a6b33a78
parent cdb4c59902dee4b502badc17ebfb219b6d174c94

Small code improvements.
Fixed bug with it - the server didn't send message FileListData when the requested folder is unavailable for any reasons.

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

vncviewer/FTDialog.cxx

diff --git a/vncviewer/FTDialog.cxx b/vncviewer/FTDialog.cxx
index 409d3b1..5f71f7d 100644
--- a/vncviewer/FTDialog.cxx
+++ b/vncviewer/FTDialog.cxx
@@ -403,9 +403,12 @@
   m_bLocalBrowsing = false;
 
   m_pBrowseDlg = new FTBrowseDlg(this);
-  m_pBrowseDlg->create();
-
-  m_pFileTransfer->requestFileList("", FT_FLR_DEST_BROWSE, true);
+  if (m_pBrowseDlg->create()) {
+    m_pFileTransfer->requestFileList("", FT_FLR_DEST_BROWSE, true);
+  } else {
+    delete m_pBrowseDlg;
+    m_pBrowseDlg = NULL;
+  }
 }
 
 void 
@@ -439,7 +442,7 @@
 void
 FTDialog::showRemoteLVItems()
 {
-  m_pFileTransfer->requestFileList(m_szRemotePathTmp, FT_FLR_DEST_MAIN, 0);
+  m_pFileTransfer->requestFileList(m_szRemotePathTmp, FT_FLR_DEST_MAIN, false);
 }
 
 void 
@@ -473,6 +476,8 @@
 FTDialog::reqFolderUnavailable()
 {
   strcpy(m_szRemotePathTmp, m_szRemotePath);
+  SetWindowText(m_hwndRemotePath, m_szRemotePath);
+  UpdateWindow(m_hwndFTDialog);
 }
 
 int

vncviewer/FileTransfer.cxx

diff --git a/vncviewer/FileTransfer.cxx b/vncviewer/FileTransfer.cxx
index 46d4799..cf57072 100644
--- a/vncviewer/FileTransfer.cxx
+++ b/vncviewer/FileTransfer.cxx
@@ -382,8 +382,7 @@
   sprintf(fullPath, "%s\\%s", pPath, pName);
   m_pFTDialog->setStatusText("Creating Remote Folder: %s", fullPath);
   writeFileCreateDirRqst(strlen(fullPath), fullPath);
-  m_queueFileListRqst.add(pPath, 0, 0, FT_FLR_DEST_MAIN);
-  writeFileListRqst(strlen(pPath), pPath, false);
+  requestFileList(pPath, FT_FLR_DEST_MAIN, false);
 }
 
 void 
@@ -397,8 +396,7 @@
 
   writeFileRenameRqst(strlen(fullOldName), strlen(fullNewName),
                       fullOldName, fullNewName);
-  m_queueFileListRqst.add(pPath, 0, 0, FT_FLR_DEST_MAIN);
-  writeFileListRqst(strlen(pPath), pPath, false);
+  requestFileList(pPath, FT_FLR_DEST_MAIN, false);
 }
 
 bool