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

Fixed crash in getJIDWithFeature

Browse source
This commit is contained in:
HanzZ 2011-11-14 18:38:58 +01:00
parent bcf60737f9
commit 6cabfd73ff
2 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/rostermanager.cpp
View file

@ -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);
}
}
}

4
src/user.cpp
View file

@ -97,6 +97,10 @@ Swift::JID User::getJIDWithFeature(const std::string &feature) {
else {
continue;
}
if (!discoInfo) {
continue;
}
#else
continue;
#endif