Index: pixmaps/status/default/Makefile.am =================================================================== RCS file: /cvsroot/gaim/gaim/pixmaps/status/default/Makefile.am,v retrieving revision 1.24 diff -u -u -r1.24 Makefile.am --- pixmaps/status/default/Makefile.am 24 Jul 2004 15:31:14 -0000 1.24 +++ pixmaps/status/default/Makefile.am 26 Sep 2004 04:20:28 -0000 @@ -36,7 +36,9 @@ voice.png \ wireless.png \ yahoo.png \ - zephyr.png + zephyr.png \ + blocked.png \ + nr.png gaimstatuspixdir = $(datadir)/pixmaps/gaim/status/default Index: src/protocols/msn/msn.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/protocols/msn/msn.c,v retrieving revision 1.320.2.4 diff -u -u -r1.320.2.4 msn.c --- src/protocols/msn/msn.c 17 Sep 2004 21:56:13 -0000 1.320.2.4 +++ src/protocols/msn/msn.c 26 Sep 2004 04:20:34 -0000 @@ -394,23 +394,35 @@ MsnUser *user; char *emblems[4] = { NULL, NULL, NULL, NULL }; int away_type = MSN_AWAY_TYPE(b->uc); - int i = 0; + int i = 1; user = b->proto_data; + if (user == NULL) + { + emblems[0] = "offline"; + } + else + { + if (!(user->list_op & (1 << MSN_LIST_RL))) + emblems[0] = "nr"; + if (user->list_op & (1 << MSN_LIST_BL)) + emblems[i++] = "blocked"; + if (user->mobile) + emblems[i++] = "wireless"; + } + if (b->present == GAIM_BUDDY_OFFLINE) - emblems[i++] = "offline"; + { + if (emblems[0] == NULL) + emblems[0] = "offline"; + } else if (away_type == MSN_BUSY || away_type == MSN_PHONE) emblems[i++] = "occupied"; else if (away_type != 0) emblems[i++] = "away"; - if (user == NULL) - { - emblems[0] = "offline"; - } - else if (user->mobile) - emblems[i++] = "wireless"; + *se = emblems[0]; *sw = emblems[1]; @@ -447,6 +459,11 @@ (user->list_op & (1 << MSN_LIST_RL)) ? _("Yes") : _("No")); + g_string_append_printf(s, _("\n%s: %s"), _("Blocked"), + (user->list_op & (1 << MSN_LIST_BL)) ? + _("Yes") : _("No")); + + return g_string_free(s, FALSE); } --- /dev/null 2004-02-23 22:02:56.000000000 +0100 +++ pixmaps/status/default/nr.png 2004-09-26 06:31:54.776646280 +0200 @@ -0,0 +1,7 @@ +PNG + + IHDR;֕J pHYs  tIME [ctEXtCommentCreated with The GIMPd%nIIDATxڍ1KAK +yB$JBk"66b#`Rb!B2` +a@c3+.^7ldR8&M- +pkX*Iyw,y؎CxO:t%>MmR#|Q{J&]yORI=&U5$oҾ |yttƒLZsg(&\dq'K.ׄ}$%{:@ N6`p}P&ӲMzIi&}8$|4IM:LZC`'a0@(toҙI| +LZ?x,}rOIENDB` --- /dev/null 2004-02-23 22:02:56.000000000 +0100 +++ pixmaps/status/default/blocked.png 2004-09-26 06:32:04.019241192 +0200 @@ -0,0 +1,3 @@ +PNG + + IHDR;֕JbKGD pHYs  tIME 5=tEXtCommentCreated with The GIMPd%nIDATxڝ10E:ATt`,9/NisMB8b;3KxrAgUeJst"=]!{~c;-{LM0 FF!3r`cv5c$e=jGVکjk!Iuc=s$keVXJp8,O\Λ49) e <^99 WtMߥqBGt2_czcIENDB`