Mercurial > pidgin.yaz
changeset 13733:0ab02f082333
[gaim-migrate @ 16144]
Disconnect an account before removing it from our list of accounts.
This gets rid of an assertion failure when deleting an online
account
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Sun, 07 May 2006 19:45:02 +0000 |
| parents | 79720436df40 |
| children | 760528340ee3 |
| files | src/account.c |
| diffstat | 1 files changed, 3 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/account.c Sun May 07 18:28:32 2006 +0000 +++ b/src/account.c Sun May 07 19:45:02 2006 +0000 @@ -865,11 +865,6 @@ gaim_debug_info("account", "Destroying account %p\n", account); - if (gaim_account_is_connected(account)) - gaim_account_disconnect(account); - - gaim_debug_info("account", "Continuing to destroy account %p\n", account); - for (l = gaim_get_conversations(); l != NULL; l = l->next) { GaimConversation *conv = (GaimConversation *)l->data; @@ -2132,6 +2127,9 @@ g_return_if_fail(account != NULL); + if (gaim_account_is_connected(account)) + gaim_account_disconnect(account); + gaim_notify_close_with_handle(account); gaim_request_close_with_handle(account);