Mercurial > pidgin.yaz
changeset 22118:8243222c8c1b
merge of '59861e303c2e7d7bfe9c10a06497b1aaa47d6588'
and '74122e66cd2ced071a030e5c2b33b64622b2fead'
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Tue, 15 Jan 2008 17:56:16 +0000 |
| parents | bdfe6c71c153 (current diff) 651ab2001da2 (diff) |
| children | 392bfb84d372 |
| files | |
| diffstat | 2 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/oscar/libaim.c Tue Jan 15 17:43:31 2008 +0000 +++ b/libpurple/protocols/oscar/libaim.c Tue Jan 15 17:56:16 2008 +0000 @@ -92,11 +92,11 @@ NULL, /* whiteboard_prpl_ops */ NULL, /* send_raw */ NULL, /* roomlist_room_serialize */ + NULL, /* unregister_user */ + NULL, /* send_attention */ + NULL, /* get_attention_types */ /* padding */ - NULL, - NULL, - NULL, NULL };
--- a/libpurple/protocols/oscar/libicq.c Tue Jan 15 17:43:31 2008 +0000 +++ b/libpurple/protocols/oscar/libicq.c Tue Jan 15 17:56:16 2008 +0000 @@ -92,11 +92,11 @@ NULL, /* whiteboard_prpl_ops */ NULL, /* send_raw */ NULL, /* roomlist_room_serialize */ + NULL, /* unregister_user */ + NULL, /* send_attention */ + NULL, /* get_attention_types */ /* padding */ - NULL, - NULL, - NULL, NULL };