Mercurial > pidgin
changeset 29466:c9866e46f629
Some code got duplicated during merge...
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Tue, 09 Feb 2010 20:14:10 +0000 |
| parents | 9b4b5bdc57d8 |
| children | 65004796201d |
| files | libpurple/protocols/oscar/oscar.c |
| diffstat | 1 files changed, 0 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/oscar/oscar.c Mon Feb 08 22:10:41 2010 +0000 +++ b/libpurple/protocols/oscar/oscar.c Tue Feb 09 20:14:10 2010 +0000 @@ -6199,8 +6199,6 @@ return "admin"; if (userinfo->flags & AIM_FLAG_ACTIVEBUDDY) return "bot"; - if (userinfo->capabilities & OSCAR_CAPABILITY_HIPTOP) - return "hiptop"; if (userinfo->capabilities & OSCAR_CAPABILITY_SECUREIM) return "secure"; if (userinfo->icqinfo.status & AIM_ICQ_STATE_BIRTHDAY)