Mercurial > pidgin
comparison src/account.c @ 10742:4228b6d78506
[gaim-migrate @ 12344]
Combine gaim_connection_destroy and gaim_connection_disconnect
committer: Tailor Script <tailor@pidgin.im>
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Sun, 27 Mar 2005 00:20:43 +0000 |
parents | 94cc67130789 |
children | 279eee07dd42 |
comparison
equal
deleted
inserted
replaced
10741:2f5d99f963eb | 10742:4228b6d78506 |
---|---|
707 | 707 |
708 g_return_if_fail(account != NULL); | 708 g_return_if_fail(account != NULL); |
709 | 709 |
710 gaim_debug_info("account", "Destroying account %p\n", account); | 710 gaim_debug_info("account", "Destroying account %p\n", account); |
711 | 711 |
712 if (account->gc != NULL) | 712 if (gaim_account_is_connected(account)) |
713 gaim_connection_destroy(account->gc); | 713 gaim_account_disconnect(account); |
714 | 714 |
715 gaim_debug_info("account", "Continuing to destroy account %p\n", account); | 715 gaim_debug_info("account", "Continuing to destroy account %p\n", account); |
716 | 716 |
717 for (l = gaim_get_conversations(); l != NULL; l = l->next) | 717 for (l = gaim_get_conversations(); l != NULL; l = l->next) |
718 { | 718 { |
829 g_return_if_fail(gaim_account_is_connected(account)); | 829 g_return_if_fail(gaim_account_is_connected(account)); |
830 | 830 |
831 gaim_debug_info("account", "Disconnecting account %p\n", account); | 831 gaim_debug_info("account", "Disconnecting account %p\n", account); |
832 | 832 |
833 account->disconnecting = TRUE; | 833 account->disconnecting = TRUE; |
834 | |
834 gc = gaim_account_get_connection(account); | 835 gc = gaim_account_get_connection(account); |
835 | 836 gaim_connection_destroy(gc); |
836 gaim_connection_disconnect(gc); | |
837 | |
838 gaim_account_set_connection(account, NULL); | 837 gaim_account_set_connection(account, NULL); |
838 | |
839 account->disconnecting = FALSE; | 839 account->disconnecting = FALSE; |
840 } | 840 } |
841 | 841 |
842 void | 842 void |
843 gaim_account_notify_added(GaimAccount *account, const char *id, | 843 gaim_account_notify_added(GaimAccount *account, const char *id, |
1029 g_return_if_fail(account != NULL); | 1029 g_return_if_fail(account != NULL); |
1030 | 1030 |
1031 g_free(account->buddy_icon); | 1031 g_free(account->buddy_icon); |
1032 account->buddy_icon = (icon == NULL ? NULL : g_strdup(icon)); | 1032 account->buddy_icon = (icon == NULL ? NULL : g_strdup(icon)); |
1033 if (gaim_account_is_connected(account)) | 1033 if (gaim_account_is_connected(account)) |
1034 serv_set_buddyicon(account->gc, icon); | 1034 serv_set_buddyicon(gaim_account_get_connection(account), icon); |
1035 | 1035 |
1036 schedule_accounts_save(); | 1036 schedule_accounts_save(); |
1037 } | 1037 } |
1038 | 1038 |
1039 void | 1039 void |