Fix the build system in gtk, plus a couple of compilation errors. wxWebView now succe...

[wxWidgets.git] / src / common / ftp.cpp

diff --git a/src/common/ftp.cpp b/src/common/ftp.cpp
index 218fa457842eb05cafea224ffb0c3bac89504772..ae77931ca7a9d9b660f5cca019530d1eeb2a2350 100644 (file)
--- a/src/common/ftp.cpp
+++ b/src/common/ftp.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        common/ftp.cpp
+// Name:        src/common/ftp.cpp

 // Purpose:     FTP protocol
 // Author:      Guilhem Lavaux
 // Modified by: Mark Johnson, wxWindows@mj10777.de
 // Purpose:     FTP protocol
 // Author:      Guilhem Lavaux
 // Modified by: Mark Johnson, wxWindows@mj10777.de


@@ -203,8 +203,7 @@ wxSocketBase *wxFTP::AcceptIfActive(wxSocketBase *sock)
     {
         m_lastError = wxPROTO_CONNERR;
         wxLogError(_("Timeout while waiting for FTP server to connect, try passive mode."));
     {
         m_lastError = wxPROTO_CONNERR;
         wxLogError(_("Timeout while waiting for FTP server to connect, try passive mode."));

-        delete sock;
-        sock = NULL;
+        wxDELETE(sock);

     }
     else
     {
     }
     else
     {


@@ -687,7 +686,7 @@ public:
 
         // when checking the result, the stream will
         // almost always show an error, even if the file was
 
         // when checking the result, the stream will
         // almost always show an error, even if the file was

-        // properly transfered, thus, lets just grab the result
+        // properly transfered, thus, let's just grab the result

 
         // we are looking for "226 transfer completed"
         char code = m_ftp->GetResult();
 
         // we are looking for "226 transfer completed"
         char code = m_ftp->GetResult();