Mercurial > pidgin.yaz

comparison src/protocols/oscar/oscar.c @ 11522:a26eb48d1953

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[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
comparison
equal deleted inserted replaced
11521:d41aabad3b7a 11522:a26eb48d1953
47 47
48 #include "aim.h" 48 #include "aim.h"
49 49
50 #define OSCAR_STATUS_ID_INVISIBLE "invisible" 50 #define OSCAR_STATUS_ID_INVISIBLE "invisible"
51 #define OSCAR_STATUS_ID_OFFLINE "offline" 51 #define OSCAR_STATUS_ID_OFFLINE "offline"
52 #define OSCAR_STATUS_ID_ONLINE "online"
53 #define OSCAR_STATUS_ID_AVAILABLE "available" 52 #define OSCAR_STATUS_ID_AVAILABLE "available"
54 #define OSCAR_STATUS_ID_AWAY "away" 53 #define OSCAR_STATUS_ID_AWAY "away"
55 #define OSCAR_STATUS_ID_DND "dnd" 54 #define OSCAR_STATUS_ID_DND "dnd"
56 #define OSCAR_STATUS_ID_NA "na" 55 #define OSCAR_STATUS_ID_NA "na"
57 #define OSCAR_STATUS_ID_OCCUPIED "occupied" 56 #define OSCAR_STATUS_ID_OCCUPIED "occupied"
6631 account->perm_deny = 3; 6630 account->perm_deny = 3;
6632 6631
6633 if ((od->sess->ssi.received_data) && (aim_ssi_getpermdeny(od->sess->ssi.local) != account->perm_deny)) 6632 if ((od->sess->ssi.received_data) && (aim_ssi_getpermdeny(od->sess->ssi.local) != account->perm_deny))
6634 aim_ssi_setpermdeny(od->sess, account->perm_deny, 0xffffffff); 6633 aim_ssi_setpermdeny(od->sess, account->perm_deny, 0xffffffff);
6635 6634
6636 if (!strcmp(status_id, OSCAR_STATUS_ID_ONLINE) || !strcmp(status_id, OSCAR_STATUS_ID_AVAILABLE)) 6635 if (!strcmp(status_id, OSCAR_STATUS_ID_AVAILABLE) || !strcmp(status_id, OSCAR_STATUS_ID_AVAILABLE))
6637 aim_setextstatus(od->sess, AIM_ICQ_STATE_NORMAL); 6636 aim_setextstatus(od->sess, AIM_ICQ_STATE_NORMAL);
6638 6637
6639 else if (!strcmp(status_id, OSCAR_STATUS_ID_AWAY)) 6638 else if (!strcmp(status_id, OSCAR_STATUS_ID_AWAY))
6640 aim_setextstatus(od->sess, AIM_ICQ_STATE_AWAY); 6639 aim_setextstatus(od->sess, AIM_ICQ_STATE_AWAY);
6641 6640
7758 7757
7759 /* Oscar-common status types */ 7758 /* Oscar-common status types */
7760 type = gaim_status_type_new_full(GAIM_STATUS_OFFLINE, 7759 type = gaim_status_type_new_full(GAIM_STATUS_OFFLINE,
7761 OSCAR_STATUS_ID_OFFLINE, 7760 OSCAR_STATUS_ID_OFFLINE,
7762 _("Offline"), FALSE, TRUE, FALSE); 7761 _("Offline"), FALSE, TRUE, FALSE);
7763 status_types = g_list_append(status_types, type);
7764
7765 type = gaim_status_type_new_full(GAIM_STATUS_ONLINE,
7766 OSCAR_STATUS_ID_ONLINE,
7767 _("Online"), FALSE, TRUE, FALSE);
7768 status_types = g_list_append(status_types, type); 7762 status_types = g_list_append(status_types, type);
7769 7763
7770 type = gaim_status_type_new_with_attrs(GAIM_STATUS_AVAILABLE, 7764 type = gaim_status_type_new_with_attrs(GAIM_STATUS_AVAILABLE,
7771 OSCAR_STATUS_ID_AVAILABLE, 7765 OSCAR_STATUS_ID_AVAILABLE,
7772 _("Available"), TRUE, TRUE, FALSE, 7766 _("Available"), TRUE, TRUE, FALSE,