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

 			Log("purple", "header string: " << headerString);
 			if (headerString == "SSL Certificate Verification") {
 				va_arg(actions, char *);
 				((PurpleRequestActionCb) va_arg(actions, GCallback)) (user_data, 2);
+			}
+		}
+	}
 	return NULL;
+}
 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;
+}
 class SpectrumNetworkPlugin : public NetworkPlugin {
 	public:
 		SpectrumNetworkPlugin(Config *config, SpectrumEventLoop *loop, const std::string &host, int port) : NetworkPlugin(loop, host, port) {
 			this->config = config;
+		}
 		void handleLoginRequest(const std::string &user, const std::string &legacyName, const std::string &password) {
 			PurpleAccount *account = NULL;
 			const char *protocol = CONFIG_STRING(config, "service.protocol").c_str();

include/transport/localbuddy.h

➞

Show inline comments

@@ @@ -25,25 +25,25 @@ @@
 #include <algorithm>
 #include "transport/buddy.h"
 #include "transport/rostermanager.h"
 namespace Transport {
 class LocalBuddy : public Buddy {
 	public:
 		LocalBuddy(RosterManager *rosterManager, long id);
 		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; }
 		bool getStatus(Swift::StatusShow &status, std::string &statusMessage) {
 			status = m_status;
 			statusMessage = m_statusMessage;
 			return true;
+		}
 		void setStatus(const Swift::StatusShow &status, const std::string &statusMessage) {
 			m_status = status;

include/transport/rostermanager.h

➞

Show inline comments

@@ @@ -73,29 +73,29 @@ class RosterManager { @@
 		boost::signal<void (Buddy *buddy)> onBuddySet;
 		/// Called when Buddy has been removed from this roster.
 		/// \param buddy removed Buddy
 		boost::signal<void (Buddy *buddy)> onBuddyUnset;
 		boost::signal<void (Buddy *buddy)> onBuddyAdded;
 		boost::signal<void (Buddy *buddy)> onBuddyRemoved;
 		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;
 		User *m_user;
 		Swift::Timer::ref m_setBuddyTimer;
 		Swift::Timer::ref m_RIETimer;
 };
+}

src/localbuddy.cpp

➞

Show inline comments

@@ @@ -21,13 +21,23 @@ @@
 #include "transport/localbuddy.h"
 #include "transport/user.h"
 namespace Transport {
 LocalBuddy::LocalBuddy(RosterManager *rosterManager, long id) : Buddy(rosterManager, id) {
 	m_status = Swift::StatusShow::None;
+}
 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)