libtransport.git Changeset - 1270cfcc81b2

Changeset - 1270cfcc81b2

Parent rev.

Child rev.

[Not reviewed]

0 1 0

HanzZ - 14 years ago 2011-08-02 21:52:39
hanzz.k@gmail.com

Don't overwrite alias/groups when backend does not send them

1 file changed with 9 insertions and 4 deletions:

src/networkpluginserver.cpp

0 comments (0 inline, 0 general)

src/networkpluginserver.cpp

➞

Show inline comments

@@ @@ -137,10 +137,15 @@ static void SigCatcher(int n) { @@
 static void handleBuddyPayload(LocalBuddy *buddy, const pbnetwork::Buddy &payload) {
 	buddy->setName(payload.buddyname());
 	buddy->setAlias(payload.alias());
 	std::vector<std::string> groups;
 	groups.push_back(payload.groups());
 	buddy->setGroups(groups);
 	if (!payload.alias().empty()) {
 		buddy->setAlias(payload.alias());
+	}
 	if (!payload.groups().empty()) {
 		std::vector<std::string> groups;
 		groups.push_back(payload.groups());
 		buddy->setGroups(groups);
+	}
 	buddy->setStatus(Swift::StatusShow((Swift::StatusShow::Type) payload.status()), payload.statusmessage());
 	buddy->setIconHash(payload.iconhash());
 	buddy->setBlocked(payload.blocked());

0 comments (0 inline, 0 general)