libtransport.git Changeset - 2a09696a8a3a

Changeset - 2a09696a8a3a

Parent rev.

Child rev.

[Not reviewed]

0 2 0

HanzZ - 14 years ago 2011-07-21 00:54:04
hanzz.k@gmail.com

Do not send roster push when we're not connected -> fixed leak

2 files changed with 4 insertions and 1 deletions:

spectrum/src/sample.cfg

src/rostermanager.cpp

0 comments (0 inline, 0 general)

spectrum/src/sample.cfg

➞

Show inline comments

@@ @@ -4,27 +4,27 @@ password = secret @@
 server = 127.0.0.1
 port = 5222
 server_mode = 1
 backend_host=localhost # < this option doesn't work yet
 backend_port=10001
 admin_username=admin
 admin_password=test
 #cert= #patch to PKCS#12 certificate
 #cert_password= #password to that certificate if any
 users_per_backend=1
 backend=../../backends/libpurple/spectrum_libpurple_backend
 #backend=../../backends/libircclient-qt/spectrum_libircclient-qt_backend
 protocol=prpl-jabber
 #protocol=prpl-msn
 #protocol=prpl-icq
 [backend]
 default_avatar=catmelonhead.jpg
 [logging]
 #config=logging.cfg # log4cxx/log4j logging configuration file
 #backend_config=backend_logging.cfg # log4cxx/log4j logging configuration file for backends
 [database]
-type = sqlite3 # or "none" without database backend
+type = none # or "none" without database backend
 database = test.sql
 prefix=icq

src/rostermanager.cpp

➞

Show inline comments

@@ @@ -53,48 +53,51 @@ RosterManager::~RosterManager() { @@
 		m_rosterStorage->storeBuddies();
+	}
 	sendUnavailablePresences(m_user->getJID().toBare());
 	for (std::map<std::string, Buddy *>::const_iterator it = m_buddies.begin(); it != m_buddies.end(); it++) {
 		Buddy *buddy = (*it).second;
 		if (!buddy) {
 			continue;
+		}
 		delete buddy;
+	}
 	if (m_rosterStorage)
 		delete m_rosterStorage;
+}
 void RosterManager::setBuddy(Buddy *buddy) {
 // 	m_setBuddyTimer->onTick.connect(boost::bind(&RosterManager::setBuddyCallback, this, buddy));
 // 	m_setBuddyTimer->start();
 	setBuddyCallback(buddy);
+}
 void RosterManager::sendBuddyRosterPush(Buddy *buddy) {
 	if (!m_user->isConnected())
 		return;
 	Swift::RosterPayload::ref payload = Swift::RosterPayload::ref(new Swift::RosterPayload());
 	Swift::RosterItemPayload item;
 	item.setJID(buddy->getJID().toBare());
 	item.setName(buddy->getAlias());
 	item.setGroups(buddy->getGroups());
 	item.setSubscription(Swift::RosterItemPayload::Both);
 	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->send();
+}
 void RosterManager::sendBuddySubscribePresence(Buddy *buddy) {
 	Swift::Presence::ref response = Swift::Presence::create();
 	response->setTo(m_user->getJID());
 	response->setFrom(buddy->getJID());
 	response->setType(Swift::Presence::Subscribe);
 // 	TODO: NICKNAME
 	m_component->getStanzaChannel()->sendPresence(response);
+}
 void RosterManager::setBuddyCallback(Buddy *buddy) {

0 comments (0 inline, 0 general)