pidgin: 81c3582e: Send keepalives for all types of network...

[markdoliner at pidgin.im]

----------------------------------------------------------------------
Revision: 81c3582e4a36c00dd7c62683f83fcb114b07ae85
Parent:   556a04f5e3dc6f8e218513dd260fd60bb13c33c7
Author:   markdoliner at pidgin.im
Date:     03/09/11 03:38:41
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/81c3582e4a36c00dd7c62683f83fcb114b07ae85

Changelog: 

Send keepalives for all types of network connections.  Will hopefully
make chat rooms more reliable.  Fixes #1449

Changes against parent 556a04f5e3dc6f8e218513dd260fd60bb13c33c7

  patched  ChangeLog
  patched  libpurple/protocols/oscar/flap_connection.c
  patched  libpurple/protocols/oscar/oscar.c

-------------- next part --------------
============================================================
--- ChangeLog	3948a1c489a8831fb7356be96ce567e2092967c7
+++ ChangeLog	8c74ab847a6bf1af0701610658a9c2b74b5fa2ad
@@ -18,6 +18,8 @@ version 2.7.11 (??/??/????):
 	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
============================================================
--- libpurple/protocols/oscar/oscar.c	d2c9d3d86e975571c10f6163835a48696e3e2b81
+++ libpurple/protocols/oscar/oscar.c	1832433d5ba5e7cffb9ef3f207f2af3281d3d32e
@@ -3140,12 +3140,12 @@ oscar_keepalive(PurpleConnection *gc)
 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
============================================================
--- libpurple/protocols/oscar/flap_connection.c	ff38e3d380df83877bc388025950710ca79ee0cf
+++ libpurple/protocols/oscar/flap_connection.c	417c9927a73baf39e1fe786bdcfd863b64aaad61
@@ -208,7 +208,7 @@ static gboolean flap_connection_send_que
  * @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