# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1299659921 0
# Node ID 04576947c4e07b003b8f3a1549279698ddb1e10a
# Parent  96dffe08f3f72f82c9eef4f0c691dfcdb1f4f9a9
Send keepalives for all types of network connections.  Will hopefully
make chat rooms more reliable.  Fixes #1449

diff -r 96dffe08f3f7 -r 04576947c4e0 ChangeLog
--- a/ChangeLog	Tue Mar 08 02:27:47 2011 +0000
+++ b/ChangeLog	Wed Mar 09 08:38:41 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
diff -r 96dffe08f3f7 -r 04576947c4e0 libpurple/protocols/oscar/flap_connection.c
--- a/libpurple/protocols/oscar/flap_connection.c	Tue Mar 08 02:27:47 2011 +0000
+++ b/libpurple/protocols/oscar/flap_connection.c	Wed Mar 09 08:38:41 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
diff -r 96dffe08f3f7 -r 04576947c4e0 libpurple/protocols/oscar/oscar.c
--- a/libpurple/protocols/oscar/oscar.c	Tue Mar 08 02:27:47 2011 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Wed Mar 09 08:38:41 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