pidgin: b02e49ab: Fix a connection timeout that occurs wit...

[rekkanoryo at pidgin.im]

-----------------------------------------------------------------
Revision: b02e49ab446349d1bda77b32abd5de731fa8bcee
Ancestor: b37b88fa7bf2136b9e8420cb58e2be679f2b899a
Author: martin at zone-mr.net
Date: 2008-12-21T04:45:20
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/b02e49ab446349d1bda77b32abd5de731fa8bcee

Modified files:
        COPYRIGHT ChangeLog libpurple/protocols/gg/buddylist.c

ChangeLog: 

Fix a connection timeout that occurs with empty Gadu-Gadu buddy lists.
Fixes #6270.

-------------- next part --------------
============================================================
--- COPYRIGHT	51936b412e856f920a620dc763e100b4757088c7
+++ COPYRIGHT	47d8fa622a0f9d5241fefc50249a8e27070ef913
@@ -345,6 +345,7 @@ Miguel Rodr?guez (migrax)
 Luciano Miguel Ferreira Rocha
 Andrew Rodland
 Miguel Rodr?guez (migrax)
+Martin Rosinski
 Bob Rossi
 Jason Roth
 Jean-Francois Roy
============================================================
--- ChangeLog	4b5674bbf6af9f0d6742b210fb2ddca39f0135d8
+++ ChangeLog	1a53d2b91aa5040cd71bacc9560a16a3a58a31c3
@@ -1,6 +1,9 @@ version 2.5.4 (??/??/????):
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
 version 2.5.4 (??/??/????):
+	libpurple:
+	* Fix a connection timeout with empty Gadu-Gady buddy lists. (Martin
+	  Rosinski)
 
 version 2.5.3 (12/20/2008):
 	libpurple:
============================================================
--- libpurple/protocols/gg/buddylist.c	ab55dff87edd72a8874c10b6cc39de421c7e1cde
+++ libpurple/protocols/gg/buddylist.c	bb4df146e151d8cb4b852cd2346cb51306106958
@@ -46,7 +46,7 @@ void ggp_buddylist_send(PurpleConnection
 	PurpleBuddy *buddy;
 	uin_t *userlist = NULL;
 	gchar *types = NULL;
-	int size = 0;
+	int size = 0, ret = 0;
 
 	if ((blist = purple_get_blist()) == NULL)
 	    return;
@@ -79,12 +79,12 @@ void ggp_buddylist_send(PurpleConnection
 		}
 	}
 
+	ret = gg_notify_ex(info->session, userlist, types, size);
+	purple_debug_info("gg", "send: ret=%d; size=%d\n", ret, size);
+	
 	if (userlist) {
-		int ret = gg_notify_ex(info->session, userlist, types, size);
 		g_free(userlist);
 		g_free(types);
-
-		purple_debug_info("gg", "send: ret=%d; size=%d\n", ret, size);
 	}
 }
 /* }}} */