Mercurial > pidgin
diff libpurple/protocols/oscar/oscar.h @ 30648:1558900f47e5
Merged my changes that fix #11964 and #12593. Mark looked over them
and said they looked good to him.
applied changes from 7b998c02b684a694f1089bee715e4a3952bbcf08
through 563c6a79e1266b750fe4bd608890195cfbcd8a2c
| author | ivan.komarov@soc.pidgin.im |
|---|---|
| date | Sat, 30 Oct 2010 21:53:38 +0000 |
| parents | 9d028dbd76f4 |
| children | 0cf50b0f7af4 8d6630912021 |
line wrap: on
line diff
--- a/libpurple/protocols/oscar/oscar.h Sat Oct 30 21:36:34 2010 +0000 +++ b/libpurple/protocols/oscar/oscar.h Sat Oct 30 21:53:38 2010 +0000 @@ -1304,7 +1304,7 @@ /* userinfo.c - displaying user information */ -void oscar_user_info_append_status(PurpleConnection *gc, PurpleNotifyUserInfo *user_info, PurpleBuddy *b, aim_userinfo_t *userinfo, gboolean strip_html_tags); +void oscar_user_info_append_status(PurpleConnection *gc, PurpleNotifyUserInfo *user_info, PurpleBuddy *b, aim_userinfo_t *userinfo, gboolean use_html_status); void oscar_user_info_append_extra_info(PurpleConnection *gc, PurpleNotifyUserInfo *user_info, PurpleBuddy *b, aim_userinfo_t *userinfo); void oscar_user_info_display_error(OscarData *od, guint16 error_reason, char *buddy); void oscar_user_info_display_icq(OscarData *od, struct aim_icq_info *info);