libtransport.git Changeset - 757ef11f77a4

Changeset - 757ef11f77a4

Parent rev.

Child rev.

[Not reviewed]

0 1 0

HanzZ - 13 years ago 2013-03-08 14:07:50
hanzz.k@gmail.com

Libtransport: fix removeBuddy with remote roster

1 file changed with 1 insertions and 1 deletions:

src/rostermanager.cpp

0 comments (0 inline, 0 general)

src/rostermanager.cpp

➞

Show inline comments

@@ @@ -100,25 +100,25 @@ void RosterManager::setBuddy(Buddy *buddy) { @@
 // 	m_setBuddyTimer->onTick.connect(boost::bind(&RosterManager::setBuddyCallback, this, buddy));
 // 	m_setBuddyTimer->start();
 	setBuddyCallback(buddy);
+}
 void RosterManager::removeBuddy(const std::string &name) {
 	Buddy *buddy = getBuddy(name);
 	if (!buddy) {
 		LOG4CXX_WARN(logger, m_user->getJID().toString() << ": Tried to remove unknown buddy " << name);
 		return;
+	}
-	if (m_component->inServerMode() || m_remoteRosterRequest) {
+	if (m_component->inServerMode() || m_supportRemoteRoster) {
 		sendBuddyRosterRemove(buddy);
+	}
 	else {
 		sendBuddyUnsubscribePresence(buddy);
+	}
 	if (m_rosterStorage)
 		m_rosterStorage->removeBuddy(buddy);
 	unsetBuddy(buddy);
 	delete buddy;
+}

0 comments (0 inline, 0 general)