libtransport.git Changeset - 6cabfd73ff78

Changeset - 6cabfd73ff78

Parent rev.

Child rev.

[Not reviewed]

0 2 0

HanzZ - 14 years ago 2011-11-14 18:38:58
hanzz.k@gmail.com

Fixed crash in getJIDWithFeature

2 files changed with 13 insertions and 15 deletions:

src/rostermanager.cpp

src/user.cpp

0 comments (0 inline, 0 general)

src/rostermanager.cpp

➞

Show inline comments

@@ @@ -141,8 +141,6 @@ void RosterManager::handleBuddyChanged(Buddy *buddy) { @@
+}
 void RosterManager::setBuddyCallback(Buddy *buddy) {
 	m_setBuddyTimer->onTick.disconnect(boost::bind(&RosterManager::setBuddyCallback, this, buddy));
 	LOG4CXX_INFO(logger, "Associating buddy " << buddy->getName() << " with " << m_user->getJID().toString());
 	m_buddies[buddy->getName()] = buddy;
 	onBuddySet(buddy);
@@ @@ -153,21 +151,17 @@ void RosterManager::setBuddyCallback(Buddy *buddy) { @@
 		sendBuddyRosterPush(buddy);
+	}
 	else {
 		if (m_setBuddyTimer->onTick.empty()) {
 			m_setBuddyTimer->stop();
 			if (m_supportRemoteRoster) {
 				sendBuddyRosterPush(buddy);
 		if (m_supportRemoteRoster) {
 			sendBuddyRosterPush(buddy);
+		}
 		else {
 			// Send RIE only if there's resource which supports it.
 			Swift::JID jidWithRIE = m_user->getJIDWithFeature("http://jabber.org/protocol/rosterx");
 			if (jidWithRIE.isValid()) {
 				m_RIETimer->start();
+			}
 			else {
 				// Send RIE only if there's resource which supports it.
 				Swift::JID jidWithRIE = m_user->getJIDWithFeature("http://jabber.org/protocol/rosterx");
 				if (jidWithRIE.isValid()) {
 					m_RIETimer->start();
+				}
 				else {
 					sendBuddySubscribePresence(buddy);
+				}
 				sendBuddySubscribePresence(buddy);
+			}
+		}
+	}

src/user.cpp

➞

Show inline comments

 			else {
 				continue;
+			}
 			if (!discoInfo) {
 				continue;
+			}
 #else
 			continue;
 #endif

0 comments (0 inline, 0 general)