libtransport.git Changeset - 5ad84a377594

Changeset - 5ad84a377594

Parent rev.

Child rev.

[Not reviewed]

0 1 0

Jan Kaluza - 14 years ago 2011-08-01 16:36:36
hanzz.k@gmail.com

Don't remove part of JID in prpl-any mode in vcard requets

1 file changed with 1 insertions and 1 deletions:

backends/libpurple/main.cpp

0 comments (0 inline, 0 general)

backends/libpurple/main.cpp

➞

Show inline comments

@@ @@ -332,49 +332,49 @@ class SpectrumNetworkPlugin : public NetworkPlugin { @@
+		}
 		void handleMessageSendRequest(const std::string &user, const std::string &legacyName, const std::string &message, const std::string &xhtml) {
 			PurpleAccount *account = m_sessions[user];
 			if (account) {
 				PurpleConversation *conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, legacyName.c_str(), account);
 				if (!conv) {
 					conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, legacyName.c_str());
+				}
 				if (xhtml.empty()) {
 					gchar *_markup = purple_markup_escape_text(message.c_str(), -1);
 					purple_conv_im_send(PURPLE_CONV_IM(conv), _markup);
 					g_free(_markup);
+				}
 				else {
 					purple_conv_im_send(PURPLE_CONV_IM(conv), xhtml.c_str());
+				}
+			}
+		}
 		void handleVCardRequest(const std::string &user, const std::string &legacyName, unsigned int id) {
 			PurpleAccount *account = m_sessions[user];
 			if (account) {
 				std::string name = legacyName;
 				if (CONFIG_STRING(config, "service.protocol") == "any") {
+				if (CONFIG_STRING(config, "service.protocol") == "any" && legacyName.find("prpl-") == 0) {
 					name = name.substr(name.find(".") + 1);
+				}
 				serv_get_info(purple_account_get_connection(account), name.c_str());
 				m_vcards[user + name] = id;
+			}
+		}
 		void handleVCardUpdatedRequest(const std::string &user, const std::string &p) {
 			PurpleAccount *account = m_sessions[user];
 			if (account) {
 				gssize size = p.size();
 				// this will be freed by libpurple
 				guchar *photo = (guchar *) g_malloc(size * sizeof(guchar));
 				memcpy(photo, p.c_str(), size);
 #ifdef WITH_IMAGEMAGICK
 				if (size != 0) {
 					PurplePlugin *plugin = purple_find_prpl(Transport::instance()->protocol()->protocol().c_str());
 					PurplePluginProtocolInfo *prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(plugin);
 					if (prpl_info->icon_spec.format == NULL) {
 						g_free(photo);
 						return;
+					}
 					try {

0 comments (0 inline, 0 general)