Mercurial > pidgin.yaz
comparison libpurple/protocols/oscar/oscar.c @ 20685:02df6998b466
propagate from branch 'im.pidgin.rlaager.merging.2_2_1_conflicts' (head 4ad1081695d083df424898e6e7091f731b401265)
to branch 'im.pidgin.pidgin' (head d33243e8f5347776c81f81a0e4ba3a76ae5505a5)
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Fri, 28 Sep 2007 16:34:43 +0000 |
| parents | d00e53fd9e88 408c4bb03915 |
| children | 2bb82b05d30a |
comparison
equal
deleted
inserted
replaced
| 20258:509ca8ebe515 | 20685:02df6998b466 |
|---|---|
| 5521 return "bot"; | 5521 return "bot"; |
| 5522 if (userinfo->capabilities & OSCAR_CAPABILITY_HIPTOP) | 5522 if (userinfo->capabilities & OSCAR_CAPABILITY_HIPTOP) |
| 5523 return "hiptop"; | 5523 return "hiptop"; |
| 5524 if (userinfo->capabilities & OSCAR_CAPABILITY_SECUREIM) | 5524 if (userinfo->capabilities & OSCAR_CAPABILITY_SECUREIM) |
| 5525 return "secure"; | 5525 return "secure"; |
| 5526 if (userinfo->icqinfo.status & AIM_ICQ_STATE_BIRTHDAY) | |
| 5527 return "birthday"; | |
| 5526 } | 5528 } |
| 5527 return NULL; | 5529 return NULL; |
| 5528 } | 5530 } |
| 5529 | 5531 |
| 5530 void oscar_tooltip_text(PurpleBuddy *b, PurpleNotifyUserInfo *user_info, gboolean full) { | 5532 void oscar_tooltip_text(PurpleBuddy *b, PurpleNotifyUserInfo *user_info, gboolean full) { |