# HG changeset patch # User Martin Rosinski # Date 1229834720 0 # Node ID c9c4b31d98a72599ff0f911db8bdfe0b3752dbec # Parent 60c07b55a24a8c4fbb139519b1479961ad0f5656 Fix a connection timeout that occurs with empty Gadu-Gadu buddy lists. Fixes #6270. committer: John Bailey diff -r 60c07b55a24a -r c9c4b31d98a7 COPYRIGHT --- a/COPYRIGHT Sun Dec 21 04:14:18 2008 +0000 +++ b/COPYRIGHT Sun Dec 21 04:45:20 2008 +0000 @@ -345,6 +345,7 @@ Luciano Miguel Ferreira Rocha Andrew Rodland Miguel Rodríguez (migrax) +Martin Rosinski Bob Rossi Jason Roth Jean-Francois Roy diff -r 60c07b55a24a -r c9c4b31d98a7 ChangeLog --- a/ChangeLog Sun Dec 21 04:14:18 2008 +0000 +++ b/ChangeLog Sun Dec 21 04:45:20 2008 +0000 @@ -1,6 +1,9 @@ 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: diff -r 60c07b55a24a -r c9c4b31d98a7 libpurple/protocols/gg/buddylist.c --- a/libpurple/protocols/gg/buddylist.c Sun Dec 21 04:14:18 2008 +0000 +++ b/libpurple/protocols/gg/buddylist.c Sun Dec 21 04:45:20 2008 +0000 @@ -46,7 +46,7 @@ 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 @@ } } + 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); } } /* }}} */