soc.2009.transport: 3312c607: working transferFinished callback
hanzz at soc.pidgin.im
hanzz at soc.pidgin.im
Sun Aug 9 09:50:52 EDT 2009
-----------------------------------------------------------------
Revision: 3312c607b84e22153705a58b43ccff4156a1a153
Ancestor: c538790d6e74c74ddbbadb613e4cd0c96c8c23e4
Author: hanzz at soc.pidgin.im
Date: 2009-08-09T13:48:37
Branch: im.pidgin.soc.2009.transport
URL: http://d.pidgin.im/viewmtn/revision/info/3312c607b84e22153705a58b43ccff4156a1a153
Modified files:
filetransfermanager.cpp filetransferrepeater.cpp
ChangeLog:
working transferFinished callback
-------------- next part --------------
============================================================
--- filetransfermanager.cpp 004dd5fedef5cc62dc0e28665f1a87f7409a98af
+++ filetransfermanager.cpp b7d51f03d4dbf606760c25576e98e51862288d71
@@ -60,6 +60,7 @@ void FileTransferManager::handleFTReques
m_info[sid].straight = true;
}
else {
+ user->addFiletransfer(from, sid, SIProfileFT::FTTypeS5B, to, size);
m_sip->acceptFT(from, sid, SIProfileFT::FTTypeS5B, to);
m_info[sid].straight = false;
}
============================================================
--- filetransferrepeater.cpp 903090e5dc11b09473a34cdac108f0e52db2d4fd
+++ filetransferrepeater.cpp eba4f8acd3d5cdc38d22d9dc63f626e0e9a2c5ac
@@ -183,7 +183,7 @@ static gboolean transferFinished(gpointe
static gboolean transferFinished(gpointer data) {
ReceiveFile *receive = (ReceiveFile *) data;
User *user = receive->user();
- std::string filename = receive->filename();
+ std::string filename(receive->filename());
Log().Get(user->jid()) << "trying to send file "<< filename;
if (user->account()){
if (user->isConnected()){
@@ -201,6 +201,7 @@ static gboolean transferFinished(gpointe
}
}
receive->dispose();
+ return FALSE;
}
ReceiveFile::ReceiveFile(gloox::Bytestream *stream, int size, const std::string &filename, User *user, FiletransferRepeater *manager) {
More information about the Commits
mailing list