stv0g/spectrum2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

remove remaining SetRosterRequests in user destructor

Browse source
This commit is contained in:
HanzZ 2011-08-31 19:37:58 +02:00
parent ff42794006
commit ec3606e8f6
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/transport/rostermanager.h
View file

@ -100,7 +100,7 @@ class RosterManager {
void setBuddyCallback(Buddy *buddy);
void sendRIE();
void handleBuddyRosterPushResponse(Swift::ErrorPayload::ref error, const std::string &key);
void handleBuddyRosterPushResponse(Swift::ErrorPayload::ref error, Swift::SetRosterRequest::ref request, const std::string &key);
std::map<std::string, Buddy *, std::less<std::string>, boost::pool_allocator< std::pair<std::string, Buddy *> > > m_buddies;
Component *m_component;
@ -108,6 +108,7 @@ class RosterManager {
User *m_user;
Swift::Timer::ref m_setBuddyTimer;
Swift::Timer::ref m_RIETimer;
std::list <Swift::SetRosterRequest::ref> m_requests;
};
}

14
src/rostermanager.cpp
View file

@ -30,6 +30,7 @@
#include "Swiften/Elements/RosterItemPayload.h"
#include "Swiften/Elements/RosterItemExchangePayload.h"
#include "log4cxx/logger.h"
#include <boost/foreach.hpp>
using namespace log4cxx;
@ -63,6 +64,11 @@ RosterManager::~RosterManager() {
delete buddy;
}
BOOST_FOREACH(Swift::SetRosterRequest::ref request, m_requests) {
request->onResponse.disconnect_all_slots();
}
m_requests.clear();
boost::singleton_pool<boost::pool_allocator_tag, sizeof(unsigned int)>::release_memory();
if (m_rosterStorage)
@ -89,8 +95,9 @@ void RosterManager::sendBuddyRosterPush(Buddy *buddy) {
payload->addItem(item);
Swift::SetRosterRequest::ref request = Swift::SetRosterRequest::create(payload, m_user->getJID().toBare(), m_component->getIQRouter());
request->onResponse.connect(boost::bind(&RosterManager::handleBuddyRosterPushResponse, this, _1, buddy->getName()));
request->onResponse.connect(boost::bind(&RosterManager::handleBuddyRosterPushResponse, this, _1, request, buddy->getName()));
request->send();
m_requests.push_back(request);
}
void RosterManager::sendBuddySubscribePresence(Buddy *buddy) {
@ -152,10 +159,13 @@ void RosterManager::storeBuddy(Buddy *buddy) {
}
}
void RosterManager::handleBuddyRosterPushResponse(Swift::ErrorPayload::ref error, const std::string &key) {
void RosterManager::handleBuddyRosterPushResponse(Swift::ErrorPayload::ref error, Swift::SetRosterRequest::ref request, const std::string &key) {
if (m_buddies[key] != NULL) {
m_buddies[key]->handleBuddyChanged();
}
m_requests.remove(request);
request->onResponse.disconnect_all_slots();
}
Buddy *RosterManager::getBuddy(const std::string &name) {