Mercurial > pidgin
diff src/protocols/msn/msn.c @ 2501:227cc42ffa6e
[gaim-migrate @ 2514]
i should have hidden something ultra-secret in this.
committer: Tailor Script <tailor@pidgin.im>
author | Eric Warmenhoven <eric@warmenhoven.org> |
---|---|
date | Sun, 14 Oct 2001 11:36:36 +0000 |
parents | 2c1950c5544a |
children | 8229710b343b |
line wrap: on
line diff
--- a/src/protocols/msn/msn.c Sun Oct 14 05:52:36 2001 +0000 +++ b/src/protocols/msn/msn.c Sun Oct 14 11:36:36 2001 +0000 @@ -688,7 +688,7 @@ } else if (!g_strncasecmp(buf, "INF", 3)) { } else if (!g_strncasecmp(buf, "ILN", 3)) { char *state, *user, *tmp = buf; - int status = UC_NORMAL; + int status = 0; GET_NEXT(tmp); @@ -701,17 +701,17 @@ GET_NEXT(tmp); if (!g_strcasecmp(state, "BSY")) { - status |= (MSN_BUSY << 5); + status |= UC_UNAVAILABLE | (MSN_BUSY << 1); } else if (!g_strcasecmp(state, "IDL")) { - status |= (MSN_IDLE << 5); + status |= UC_UNAVAILABLE | (MSN_IDLE << 1); } else if (!g_strcasecmp(state, "BRB")) { - status |= (MSN_BRB << 5); + status |= UC_UNAVAILABLE | (MSN_BRB << 1); } else if (!g_strcasecmp(state, "AWY")) { - status = UC_UNAVAILABLE; + status |= UC_UNAVAILABLE | (MSN_AWAY << 1); } else if (!g_strcasecmp(state, "PHN")) { - status |= (MSN_PHONE << 5); + status |= UC_UNAVAILABLE | (MSN_PHONE << 1); } else if (!g_strcasecmp(state, "LUN")) { - status |= (MSN_LUNCH << 5); + status |= UC_UNAVAILABLE | (MSN_LUNCH << 1); } serv_got_update(gc, user, 1, 0, 0, 0, status, 0); @@ -804,7 +804,7 @@ g_free(msg); } else if (!g_strncasecmp(buf, "NLN", 3)) { char *state, *user, *tmp = buf; - int status = UC_NORMAL; + int status = 0; GET_NEXT(tmp); state = tmp; @@ -815,17 +815,17 @@ GET_NEXT(tmp); if (!g_strcasecmp(state, "BSY")) { - status |= (MSN_BUSY << 5); + status |= UC_UNAVAILABLE | (MSN_BUSY << 1); } else if (!g_strcasecmp(state, "IDL")) { - status |= (MSN_IDLE << 5); + status |= UC_UNAVAILABLE | (MSN_IDLE << 1); } else if (!g_strcasecmp(state, "BRB")) { - status |= (MSN_BRB << 5); + status |= UC_UNAVAILABLE | (MSN_BRB << 1); } else if (!g_strcasecmp(state, "AWY")) { - status = UC_UNAVAILABLE; + status |= UC_UNAVAILABLE | (MSN_AWAY << 1); } else if (!g_strcasecmp(state, "PHN")) { - status |= (MSN_PHONE << 5); + status |= UC_UNAVAILABLE | (MSN_PHONE << 1); } else if (!g_strcasecmp(state, "LUN")) { - status |= (MSN_LUNCH << 5); + status |= UC_UNAVAILABLE | (MSN_LUNCH << 1); } serv_got_update(gc, user, 1, 0, 0, 0, status, 0); @@ -1261,7 +1261,7 @@ msn_kill_switch(ms); } -static GList *msn_away_states() +static GList *msn_away_states(struct gaim_connection *gc) { GList *m = NULL; @@ -1339,7 +1339,7 @@ static char **msn_list_icon(int uc) { - if (uc == UC_NORMAL) + if (uc == 0) return msn_online_xpm; return msn_away_xpm; @@ -1372,11 +1372,11 @@ struct buddy *b = find_buddy(gc, who); static char buf[MSN_BUF_LEN]; - if (!b || !(b->uc >> 5)) + if (!b || !(b->uc >> 1)) return m; pbm = g_new0(struct proto_buddy_menu, 1); - g_snprintf(buf, sizeof(buf), "Status: %s", msn_get_away_text(b->uc >> 5)); + g_snprintf(buf, sizeof(buf), "Status: %s", msn_get_away_text(b->uc >> 1)); pbm->label = buf; pbm->callback = NULL; pbm->gc = gc;