Update of /cvsroot/gaim/gaim/src/protocols/oscar
In directory usw-pr-cvs1:/tmp/cvs-serv12854/src/protocols/oscar
Modified Files:
oscar.c
Log Message:
ICQ buddies coming back from away will no longer appear to be unavailable.
Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -d -r1.108 -r1.109
--- oscar.c 5 Mar 2002 17:31:06 -0000 1.108
+++ oscar.c 6 Mar 2002 05:26:58 -0000 1.109
@@ -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);
}
}
|
