libtransport.git Changeset - d6766b4f84e8

Changeset - d6766b4f84e8

Parent rev.

Child rev.

[Not reviewed]

0 4 0

HanzZ - 14 years ago 2011-06-19 21:40:03
hanzz.k@gmail.com

Show proper aliases even for MSN

4 files changed with 22 insertions and 6 deletions:

backends/libpurple/main.cpp

include/transport/localbuddy.h

include/transport/rostermanager.h

src/localbuddy.cpp

0 comments (0 inline, 0 general)

backends/libpurple/main.cpp

➞

Show inline comments

 static std::string getAlias(PurpleBuddy *m_buddy) {
 	std::string alias;
 	if (purple_buddy_get_server_alias(m_buddy))
 		alias = (std::string) purple_buddy_get_server_alias(m_buddy);
 	else
 	PurpleContact *contact = PURPLE_CONTACT(PURPLE_BLIST_NODE(m_buddy)->parent);
 	if (contact && contact->alias) {
 		alias = contact->alias;
+	}
 	else if (purple_buddy_get_alias(m_buddy)) {
 		alias = (std::string) purple_buddy_get_alias(m_buddy);
+	}
 	else {
 		alias = (std::string) purple_buddy_get_server_alias(m_buddy);
+	}
 	return alias;
+}

include/transport/localbuddy.h

➞

Show inline comments

@@ @@ -34,7 +34,7 @@ class LocalBuddy : public Buddy { @@
 		virtual ~LocalBuddy();
 		std::string getAlias() { return m_alias; }
-		void setAlias(const std::string &alias) { m_alias = alias; }
 		void setAlias(const std::string &alias);
 		std::string getName() { return m_name; }
 		void setName(const std::string &name) { m_name = name; }

include/transport/rostermanager.h

➞

Show inline comments

@@ @@ -82,14 +82,14 @@ class RosterManager { @@
 		void handleSubscription(Swift::Presence::ref presence);
 		void sendBuddyRosterPush(Buddy *buddy);
 	private:
 		void setBuddyCallback(Buddy *buddy);
 		void sendBuddyRosterPush(Buddy *buddy);
 		void sendRIE();
 		void handleBuddyRosterPushResponse(Swift::ErrorPayload::ref error, const std::string &key);
 		std::map<std::string, Buddy *> m_buddies;
 		Component *m_component;
 		RosterStorage *m_rosterStorage;

src/localbuddy.cpp

➞

Show inline comments

 LocalBuddy::~LocalBuddy() {
+}
 void LocalBuddy::setAlias(const std::string &alias) {
 	bool changed = m_alias != alias;
 	m_alias = alias;
 	if (changed) {
 		getRosterManager()->sendBuddyRosterPush(this);
 		getRosterManager()->storeBuddy(this);
+	}
+}
+}

0 comments (0 inline, 0 general)