Mercurial > pidgin.yaz
diff src/protocols/oscar/oscar.c @ 11522:a26eb48d1953
[gaim-migrate @ 13770]
I removed the GAIM_STATUS_ONLINE primitive. Use GAIM_STATUS_AVAILABLE
instead. If the primitive is not GAIM_STATUS_OFFLINE, then the user
is online and the primitive could be GAIM_STATUS_AVAILABLE,
GAIM_STATUS_AWAY, etc.
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Mon, 12 Sep 2005 06:04:27 +0000 |
| parents | 25699eed3c37 |
| children | bf763a1b2454 |
line wrap: on
line diff
--- a/src/protocols/oscar/oscar.c Mon Sep 12 05:44:03 2005 +0000 +++ b/src/protocols/oscar/oscar.c Mon Sep 12 06:04:27 2005 +0000 @@ -49,7 +49,6 @@ #define OSCAR_STATUS_ID_INVISIBLE "invisible" #define OSCAR_STATUS_ID_OFFLINE "offline" -#define OSCAR_STATUS_ID_ONLINE "online" #define OSCAR_STATUS_ID_AVAILABLE "available" #define OSCAR_STATUS_ID_AWAY "away" #define OSCAR_STATUS_ID_DND "dnd" @@ -6633,7 +6632,7 @@ if ((od->sess->ssi.received_data) && (aim_ssi_getpermdeny(od->sess->ssi.local) != account->perm_deny)) aim_ssi_setpermdeny(od->sess, account->perm_deny, 0xffffffff); - if (!strcmp(status_id, OSCAR_STATUS_ID_ONLINE) || !strcmp(status_id, OSCAR_STATUS_ID_AVAILABLE)) + if (!strcmp(status_id, OSCAR_STATUS_ID_AVAILABLE) || !strcmp(status_id, OSCAR_STATUS_ID_AVAILABLE)) aim_setextstatus(od->sess, AIM_ICQ_STATE_NORMAL); else if (!strcmp(status_id, OSCAR_STATUS_ID_AWAY)) @@ -7762,11 +7761,6 @@ _("Offline"), FALSE, TRUE, FALSE); status_types = g_list_append(status_types, type); - type = gaim_status_type_new_full(GAIM_STATUS_ONLINE, - OSCAR_STATUS_ID_ONLINE, - _("Online"), FALSE, TRUE, FALSE); - status_types = g_list_append(status_types, type); - type = gaim_status_type_new_with_attrs(GAIM_STATUS_AVAILABLE, OSCAR_STATUS_ID_AVAILABLE, _("Available"), TRUE, TRUE, FALSE,