--- a/src/protocols/oscar/oscar.c Wed Mar 06 00:18:02 2002 +0000 +++ b/src/protocols/oscar/oscar.c Wed Mar 06 05:26:58 2002 +0000 @@ -1156,11 +1156,12 @@ if (info->flags & AIM_FLAG_AWAY) type |= UC_UNAVAILABLE; } - if (info->present & AIM_USERINFO_PRESENT_ICQEXTSTATUS) { type = (info->icqinfo.status << 6); - if (!(info->icqinfo.status & AIM_ICQ_STATE_CHAT)) + if (!(info->icqinfo.status & AIM_ICQ_STATE_CHAT) && + (info->icqinfo.status != AIM_ICQ_STATE_NORMAL)) { type |= UC_UNAVAILABLE; + } } if (caps & AIM_CAPS_ICQ) @@ -2618,6 +2619,7 @@ aim_setextstatus(od->sess, od->conn, AIM_ICQ_STATE_OUT); gc->away = ""; } else { + aim_setextstatus(od->sess, od->conn, AIM_ICQ_STATE_NORMAL); } }