Mercurial > pidgin
changeset 30646:a61147460879
merge of '30f572d2b51bbd14c6b0c0539e0ce299617b1aff'
and 'bc9c4bb89eb6d36c548b61d8b1e6b8952b9c4c0e'
| author | ivan.komarov@soc.pidgin.im |
|---|---|
| date | Sat, 30 Oct 2010 21:27:00 +0000 |
| parents | a453690ba4f4 (current diff) 7a41eb334a64 (diff) |
| children | 4297feb30ad1 |
| files | |
| diffstat | 1 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/oscar/flap_connection.c Sat Oct 30 15:30:30 2010 +0000 +++ b/libpurple/protocols/oscar/flap_connection.c Sat Oct 30 21:27:00 2010 +0000 @@ -435,11 +435,16 @@ aim_rxcallback_t userfunc; conn = data; + /* Explicitly added for debugging #5927. Don't re-order this, only + * consider removing it. + */ + purple_debug_info("oscar", "Destroying FLAP connection %p\n", conn); + od = conn->od; account = purple_connection_get_account(od->gc); - purple_debug_info("oscar", "Destroying oscar connection of " - "type 0x%04hx. Disconnect reason is %d\n", + purple_debug_info("oscar", "Destroying oscar connection (%p) of " + "type 0x%04hx. Disconnect reason is %d\n", conn, conn->type, conn->disconnect_reason); od->oscar_connections = g_slist_remove(od->oscar_connections, conn); @@ -575,7 +580,7 @@ return; purple_debug_info("oscar", "Scheduling destruction of FLAP " - "connection of type 0x%04hx\n", conn->type); + "connection %p of type 0x%04hx\n", conn, conn->type); conn->disconnect_reason = reason; g_free(conn->error_message); conn->error_message = g_strdup(error_message);