Mercurial > pidgin.yaz
changeset 12108:1d4fbf553ce2
[gaim-migrate @ 14408]
A patch from Sadrul
"when you set an account to offline while it is "connecting", it
doesn't disconnect. marv hit on this last night"
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Wed, 16 Nov 2005 00:01:23 +0000 |
| parents | 40724851e95e |
| children | 936e3b7cd864 |
| files | src/prpl.c |
| diffstat | 1 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/prpl.c Tue Nov 15 20:51:58 2005 +0000 +++ b/src/prpl.c Wed Nov 16 00:01:23 2005 +0000 @@ -289,14 +289,6 @@ g_return_if_fail(old_status != NULL); g_return_if_fail(new_status != NULL); - if (gaim_account_is_connecting(account)) - /* - * We don't need to call the set_status PRPL function because - * the PRPL will take care of setting its status during the - * connection process. - */ - return; - if (gaim_status_is_online(new_status) && gaim_account_is_disconnected(account)) { @@ -311,6 +303,14 @@ return; } + if (gaim_account_is_connecting(account)) + /* + * We don't need to call the set_status PRPL function because + * the PRPL will take care of setting its status during the + * connection process. + */ + return; + prpl = gaim_find_prpl(gaim_account_get_protocol_id(account)); if (prpl == NULL)