Sat, 30 Oct 2010 21:27:00 +0000
merge of '68d94ac1d2e78f55d75be7272ada6cf9bb9f8a9f'
and 'aea5b6af42582b23908c488264022fd4c779d560'
--- 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);