libtransport.git Changeset - 037cf20326ed

Changeset - 037cf20326ed

Parent rev.

Child rev.

[Not reviewed]

0 1 0

HanzZ - 14 years ago 2011-07-31 21:10:53
hanzz.k@gmail.com

Fixed vcards in prpl-any mode

1 file changed with 7 insertions and 5 deletions:

backends/libpurple/main.cpp

0 comments (0 inline, 0 general)

backends/libpurple/main.cpp

➞

Show inline comments

@@ @@ -356,8 +356,8 @@ class SpectrumNetworkPlugin : public NetworkPlugin { @@
 				if (CONFIG_STRING(config, "service.protocol") == "any") {
 					name = name.substr(name.find(".") + 1);
+				}
 				serv_get_info(purple_account_get_connection(account), legacyName.c_str());
 				m_vcards[user + legacyName] = id;
 				serv_get_info(purple_account_get_connection(account), name.c_str());
 				m_vcards[user + name] = id;
+			}
+		}
@@ @@ -534,8 +534,8 @@ class SpectrumNetworkPlugin : public NetworkPlugin { @@
 		std::map<PurpleAccount *, std::string> m_accounts;
 		std::map<std::string, unsigned int> m_vcards;
 		std::map<std::string, authRequest *> m_authRequests;
 	private:
 		Config *config;
 };
 static bool getStatus(PurpleBuddy *m_buddy, Swift::StatusShow &status, std::string &statusMessage) {
 		vcardEntries = vcardEntries->next;
+	}
 	if (name == purple_account_get_username(account)) {
 	bool ownInfo = name == purple_account_get_username(account);
 	std::cout << "RECEIVED " << name << " " << purple_account_get_username(account) << "\n";
 	if (ownInfo) {
 		const gchar *displayname = purple_connection_get_display_name(gc);
 		if (!displayname) {
 			displayname = purple_account_get_name_for_display(account);
+		}
+	}
 	np->handleVCard(np->m_accounts[account], np->m_vcards[np->m_accounts[account] + name], name, fullName, nickname, Swift::byteArrayToString(photo));
 	np->m_vcards.erase(np->m_accounts[account] + name);

0 comments (0 inline, 0 general)