diff --git a/src/networkpluginserver.cpp b/src/networkpluginserver.cpp index a89117b6597790d9074be056dc1ae052994f7a0e..bb8eb6809881c12b282e66287f61e9952a51d90c 100644 --- a/src/networkpluginserver.cpp +++ b/src/networkpluginserver.cpp @@ -195,6 +195,7 @@ static void handleBuddyPayload(LocalBuddy *buddy, const pbnetwork::Buddy &payloa // 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()); } diff --git a/src/rostermanager.cpp b/src/rostermanager.cpp index 4426458830b3a67bac124320c1b3af1d8a5241e5..6513511647ab678712b6adfcdaf0094e78e1fd8a 100644 --- a/src/rostermanager.cpp +++ b/src/rostermanager.cpp @@ -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);