Mercurial > pidgin.yaz
diff src/protocols/oscar/oscar.c @ 11718:11e95968c9ff
[gaim-migrate @ 14009]
PRPLs are no longer required to call gaim_account_connect() and
gaim_account_disconnect()--it is done in the core. Having the PRPLs
do it was kind of silly. And this should allow me to improve the
auto-reconnect plugin some. I think.
committer: Tailor Script <tailor@pidgin.im>
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Sat, 22 Oct 2005 20:09:24 +0000 |
parents | 9f3129911c95 |
children | fa78d6b8ec7d |
line wrap: on
line diff
--- a/src/protocols/oscar/oscar.c Sat Oct 22 19:56:02 2005 +0000 +++ b/src/protocols/oscar/oscar.c Sat Oct 22 20:09:24 2005 +0000 @@ -6653,29 +6653,19 @@ static void oscar_set_status(GaimAccount *account, GaimStatus *status) { - gboolean disconnected = gaim_account_is_disconnected(account); - GaimStatusType *type = gaim_status_get_type(status); - int primitive = gaim_status_type_get_primitive(type); - gaim_debug_info("oscar", "Set status to %s\n", gaim_status_get_name(status)); if (!gaim_status_is_active(status)) return; - if (primitive != GAIM_STATUS_OFFLINE && disconnected) { - gaim_account_connect(account); - } else if (primitive == GAIM_STATUS_OFFLINE && !disconnected) { - gaim_account_disconnect(account); - } else { - if (!gaim_account_is_connected(account)) - return; - - if (aim_sn_is_icq(gaim_account_get_username(account))) - oscar_set_status_icq(account, status); - else - /* QQQ - Should probably also set this for ICQ */ - oscar_set_status_aim(account, status); - } + if (!gaim_account_is_connected(account)) + return; + + if (aim_sn_is_icq(gaim_account_get_username(account))) + oscar_set_status_icq(account, status); + else + /* QQQ - Should probably also set this for ICQ */ + oscar_set_status_aim(account, status); } #ifdef CRAZY_WARN