← Back to branch summary

~ubuntu-branches/ubuntu/wily/wxwidgets3.0/wily-proposed

« back to all changes in this revision

Viewing changes to src/common/ftp.cpp

  • Committer: Package Import Robot
  • Author(s): Olly Betts, Olly Betts, Christian Beier
  • Date: 2014-10-07 13:12:10 UTC
  • mfrom: (1.1.2)
  • Revision ID: package-import@ubuntu.com-20141007131210-3oyq1x092j6fd8ib
Tags: 3.0.2-1
http://bugs.debian.org/762134
http://bugs.debian.org/745887
[ Olly Betts ]

* New upstream release:
  - wxTR_EDIT_LABELS now works again.  (Closes: #762134)
* Disable gcc4.9-workaround.patch, as GCC is now fixed in jessie and this
  bug is new in 4.9 so wheezy was never affected.

[ Christian Beier ]

* debian/control.in: Add BD on libnotify-dev to enable use of libnotify.
  (Closes: #745887)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/common/ftp.cpp
769
769
 
770
770
    wxString tmp_str = wxT("RETR ") + wxURI::Unescape(path);
771
771
    if ( !CheckCommand(tmp_str, '1') )
 
772
    {
 
773
        delete sock;
 
774
 
772
775
        return NULL;
 
776
    }
773
777
 
774
778
    sock = AcceptIfActive(sock);
775
779
    if ( !sock )
800
804
 
801
805
    wxString tmp_str = wxT("STOR ") + path;
802
806
    if ( !CheckCommand(tmp_str, '1') )
 
807
    {
 
808
        delete sock;
 
809
 
803
810
        return NULL;
 
811
    }
804
812
 
805
813
    sock = AcceptIfActive(sock);
806
814