# HG changeset patch # User Christian Hammond # Date 1054715729 0 # Node ID 1b5e6e6e80e9bc7ed4887acf7f6ea40625a58059 # Parent 6ec7b32ab1df1b36acf56ee837f4665467baa673 [gaim-migrate @ 6165] This should fix some connection bugs. Account's GaimConnections couldn't get set back to NULL. committer: Tailor Script diff -r 6ec7b32ab1df -r 1b5e6e6e80e9 src/account.c --- a/src/account.c Wed Jun 04 07:28:36 2003 +0000 +++ b/src/account.c Wed Jun 04 08:35:29 2003 +0000 @@ -269,7 +269,6 @@ gaim_account_set_connection(GaimAccount *account, GaimConnection *gc) { g_return_if_fail(account != NULL); - g_return_if_fail(gc != NULL); account->gc = gc; diff -r 6ec7b32ab1df -r 1b5e6e6e80e9 src/connection.c --- a/src/connection.c Wed Jun 04 07:28:36 2003 +0000 +++ b/src/connection.c Wed Jun 04 08:35:29 2003 +0000 @@ -49,6 +49,8 @@ void gaim_connection_destroy(GaimConnection *gc) { + GaimAccount *account; + g_return_if_fail(gc != NULL); if (gaim_connection_get_state(gc) != GAIM_DISCONNECTED) { @@ -57,6 +59,9 @@ return; } + account = gaim_connection_get_account(gc); + gaim_account_set_connection(account, NULL); + if (gc->display_name != NULL) g_free(gc->display_name);