libtransport.git Changeset - d8e0d03cc044

Changeset - d8e0d03cc044

Parent rev.

Child rev.

[Not reviewed]

Merge

0 1 0

vitalyster - 10 years ago 2015-09-28 16:48:44
vitalyster@gmail.com

Merge pull request #64 from Ghabry/get_info

purple backend: Prevent Vcard-Req hang when "get_info" not implemented

1 file changed with 5 insertions and 2 deletions:

backends/libpurple/main.cpp

0 comments (0 inline, 0 general)

backends/libpurple/main.cpp

➞

Show inline comments

@@ @@ -518,7 +518,11 @@ class SpectrumNetworkPlugin : public NetworkPlugin { @@
+				}
 				m_vcards[user + name] = id;
 				if (CONFIG_BOOL(config, "backend.no_vcard_fetch") && name != purple_account_get_username_wrapped(account)) {
 				PurplePlugin *prpl = purple_find_prpl_wrapped(purple_account_get_protocol_id_wrapped(account));
 				PurplePluginProtocolInfo *prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl);
 				bool support_get_info = prpl_info && prpl_info->get_info;
 				if (!support_get_info || (CONFIG_BOOL(config, "backend.no_vcard_fetch") && name != purple_account_get_username_wrapped(account))) {
 					PurpleNotifyUserInfo *user_info = purple_notify_user_info_new_wrapped();
 					notify_user_info(purple_account_get_connection_wrapped(account), name.c_str(), user_info);
 					purple_notify_user_info_destroy_wrapped(user_info);
@@ @@ -526,7 +530,6 @@ class SpectrumNetworkPlugin : public NetworkPlugin { @@
 				else {
 					serv_get_info_wrapped(purple_account_get_connection_wrapped(account), name.c_str());
+				}
+			}
+		}

0 comments (0 inline, 0 general)