← Back to branch summary

~ubuntu-branches/ubuntu/saucy/filezilla/saucy-proposed

« back to all changes in this revision

Viewing changes to src/engine/FileZillaEngine.cpp

  • Committer: Package Import Robot
  • Author(s): Adrien Cunin
  • Date: 2012-12-07 17:17:17 UTC
  • mfrom: (1.1.31)
  • Revision ID: package-import@ubuntu.com-20121207171717-nt6as62u4pa1uv11
Tags: 3.6.0.2-1ubuntu1
* Merge from Debian experimental. Remaining Ubuntu change:
   - Added debian/patches/11_use-decimal-si-by-default.patch in order to
     comply with UnitsPolicy

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/engine/FileZillaEngine.cpp
78
78
                ResetOperation(res);
79
79
 
80
80
        m_bIsInCommand = false;
81
 
        
 
81
 
82
82
        if (command.GetId() != cmd_disconnect)
83
83
                res |= m_nControlSocketError;
84
84
        else if (res & FZ_REPLY_DISCONNECTED)
85
85
                res = FZ_REPLY_OK;
86
86
        m_nControlSocketError = 0;
87
 
        
 
87
 
88
88
        return res;
89
89
}
90
90
 
108
108
                if (m_NotificationList.empty())
109
109
                        return 0;
110
110
 
111
 
                m_NotificationList.push_back(0);
 
111
                m_NotificationList.push_back(static_cast<CNotification*>(0));
112
112
        }
113
113
        else if (m_NotificationList.empty())
114
114
                return 0;
115
115
        CNotification* pNotification = m_NotificationList.front();
116
116
        m_NotificationList.pop_front();
117
 
                
 
117
 
118
118
        return pNotification;
119
119
}
120
120