Mercurial > pidgin
comparison libpurple/protocols/oscar/oscar.c @ 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 | a0fb6798d87c |
children | 44165d2f71d6 |
comparison
equal
deleted
inserted
replaced
29465:9b4b5bdc57d8 | 29466:c9866e46f629 |
---|---|
6197 if (userinfo != NULL ) { | 6197 if (userinfo != NULL ) { |
6198 if (userinfo->flags & AIM_FLAG_ADMINISTRATOR) | 6198 if (userinfo->flags & AIM_FLAG_ADMINISTRATOR) |
6199 return "admin"; | 6199 return "admin"; |
6200 if (userinfo->flags & AIM_FLAG_ACTIVEBUDDY) | 6200 if (userinfo->flags & AIM_FLAG_ACTIVEBUDDY) |
6201 return "bot"; | 6201 return "bot"; |
6202 if (userinfo->capabilities & OSCAR_CAPABILITY_HIPTOP) | |
6203 return "hiptop"; | |
6204 if (userinfo->capabilities & OSCAR_CAPABILITY_SECUREIM) | 6202 if (userinfo->capabilities & OSCAR_CAPABILITY_SECUREIM) |
6205 return "secure"; | 6203 return "secure"; |
6206 if (userinfo->icqinfo.status & AIM_ICQ_STATE_BIRTHDAY) | 6204 if (userinfo->icqinfo.status & AIM_ICQ_STATE_BIRTHDAY) |
6207 return "birthday"; | 6205 return "birthday"; |
6208 | 6206 |