Mercurial > pidgin
changeset 31318:a01d958f7b26
merge of '27d803c1a7d7bd1907e87fba4a7937a44389dd80'
and 'ad6f772bb86f527497f77c40386497f461bcf3a5'
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Thu, 10 Mar 2011 03:18:45 +0000 |
| parents | 18ca4a90842f (current diff) f3d11c84cc03 (diff) |
| children | 8cf9270acf4c |
| files | |
| diffstat | 4 files changed, 8 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Mar 09 14:01:56 2011 +0000 +++ b/ChangeLog Thu Mar 10 03:18:45 2011 +0000 @@ -18,6 +18,8 @@ AIM: * Fix a bug where some buddies from your buddy list might not show up. Affected non-English ICQ users the most. (#13386) + * Send keepalives for all types of network connections. Will hopefully + make chat rooms more reliable. (#1449) MSN: * Fix bug that prevented added buddies to your buddy list in certain
--- a/libpurple/protocols/msn/msn.c Wed Mar 09 14:01:56 2011 +0000 +++ b/libpurple/protocols/msn/msn.c Thu Mar 10 03:18:45 2011 +0000 @@ -1830,6 +1830,7 @@ msn_user_set_invite_message(user, msg); msn_user_set_pending_group(user, gname); msn_user_set_network(user, MSN_NETWORK_UNKNOWN); + /* Should probably re-use the msn_add_contact_xml function here */ tokens = g_strsplit(who, "@", 2); fqy = g_strdup_printf("<ml><d n=\"%s\"><c n=\"%s\"/></d></ml>", tokens[1],
--- a/libpurple/protocols/oscar/flap_connection.c Wed Mar 09 14:01:56 2011 +0000 +++ b/libpurple/protocols/oscar/flap_connection.c Thu Mar 10 03:18:45 2011 +0000 @@ -208,7 +208,7 @@ * @param data The optional bytestream that makes up the data portion * of this SNAC. For empty SNACs this should be NULL. * @param high_priority If TRUE, the SNAC will be queued normally if - * needed. If FALSE, it wil be queued separately, to be sent + * needed. If FALSE, it will be queued separately, to be sent * only if all high priority SNACs have been sent. */ void
--- a/libpurple/protocols/oscar/oscar.c Wed Mar 09 14:01:56 2011 +0000 +++ b/libpurple/protocols/oscar/oscar.c Thu Mar 10 03:18:45 2011 +0000 @@ -3140,12 +3140,12 @@ oscar_keepalive(PurpleConnection *gc) { OscarData *od; - FlapConnection *conn; + GSList *l; od = purple_connection_get_protocol_data(gc); - conn = flap_connection_getbytype(od, SNAC_FAMILY_LOCATE); - if (conn != NULL) - flap_connection_send_keepalive(od, conn); + for (l = od->oscar_connections; l; l = l->next) { + flap_connection_send_keepalive(od, l->data); + } } unsigned int