libtransport.git Changeset - 1c99b634a8e9

Changeset - 1c99b634a8e9

Parent rev.

Child rev.

[Not reviewed]

0 2 0

HanzZ - 13 years ago 2012-02-26 15:41:40
hanzz.k@gmail.com

Do not send empty name in roster push

2 files changed with 7 insertions and 1 deletions:

src/networkpluginserver.cpp

src/rostermanager.cpp

0 comments (0 inline, 0 general)

src/networkpluginserver.cpp

➞

Show inline comments

 	// Set alias only if it's not empty. Backends are allowed to send empty alias if it has
 	// not changed.
 	if (!payload.alias().empty()) {
 		LOG4CXX_INFO(logger, "Setting alias to " << payload.alias() << " " << buddy->getAlias());
 		buddy->setAlias(payload.alias());
+	}

src/rostermanager.cpp

➞

Show inline comments

@@ @@ -110,7 +110,12 @@ void RosterManager::sendBuddyRosterPush(Buddy *buddy) { @@
 	Swift::RosterPayload::ref payload = Swift::RosterPayload::ref(new Swift::RosterPayload());
 	Swift::RosterItemPayload item;
 	item.setJID(buddy->getJID().toBare());
 	item.setName(buddy->getAlias());
 	if (buddy->getAlias().empty()) {
 		item.setName(buddy->getJID().toBare().toString());
+	}
 	else {
 		item.setName(buddy->getAlias());
+	}
 	item.setGroups(buddy->getGroups());
 	item.setSubscription(Swift::RosterItemPayload::Both);

0 comments (0 inline, 0 general)