Mercurial > pidgin
comparison libpurple/protocols/oscar/libaim.c @ 30376:50d472b3d752
Fixed a bug I accidentally introduced in fb1ab831dedebf45ea50b6f87bfc00265a0115ef.
We now have two different set_perm_deny()'s with different semantics
(the ICQ one controls visibility, the AIM one, blocking), but
purple_ssi_parselist() always called the ICQ one, no matter what
is the current account.
I've also changed the names of functions to make the distinction clearer.
| author | ivan.komarov@soc.pidgin.im |
|---|---|
| date | Thu, 01 Jul 2010 18:56:17 +0000 |
| parents | de762c79a5f1 |
| children | 4297feb30ad1 |
comparison
equal
deleted
inserted
replaced
| 30375:ab7e28b1b478 | 30376:50d472b3d752 |
|---|---|
| 23 /* libaim is the AIM protocol plugin. It is linked against liboscar, | 23 /* libaim is the AIM protocol plugin. It is linked against liboscar, |
| 24 * which contains all the shared implementation code with libicq | 24 * which contains all the shared implementation code with libicq |
| 25 */ | 25 */ |
| 26 | 26 |
| 27 #include "oscarcommon.h" | 27 #include "oscarcommon.h" |
| 28 #include "oscar.h" | |
| 28 | 29 |
| 29 static PurplePluginProtocolInfo prpl_info = | 30 static PurplePluginProtocolInfo prpl_info = |
| 30 { | 31 { |
| 31 OPT_PROTO_MAIL_CHECK | OPT_PROTO_IM_IMAGE, | 32 OPT_PROTO_MAIL_CHECK | OPT_PROTO_IM_IMAGE, |
| 32 NULL, /* user_splits */ | 33 NULL, /* user_splits */ |
| 55 NULL, /* remove_buddies */ | 56 NULL, /* remove_buddies */ |
| 56 oscar_add_permit, /* add_permit */ | 57 oscar_add_permit, /* add_permit */ |
| 57 oscar_add_deny, /* add_deny */ | 58 oscar_add_deny, /* add_deny */ |
| 58 oscar_rem_permit, /* rem_permit */ | 59 oscar_rem_permit, /* rem_permit */ |
| 59 oscar_rem_deny, /* rem_deny */ | 60 oscar_rem_deny, /* rem_deny */ |
| 60 oscar_set_permit_deny, /* set_permit_deny */ | 61 oscar_set_aim_permdeny, /* set_permit_deny */ |
| 61 oscar_join_chat, /* join_chat */ | 62 oscar_join_chat, /* join_chat */ |
| 62 NULL, /* reject_chat */ | 63 NULL, /* reject_chat */ |
| 63 oscar_get_chat_name, /* get_chat_name */ | 64 oscar_get_chat_name, /* get_chat_name */ |
| 64 oscar_chat_invite, /* chat_invite */ | 65 oscar_chat_invite, /* chat_invite */ |
| 65 oscar_chat_leave, /* chat_leave */ | 66 oscar_chat_leave, /* chat_leave */ |