Mercurial > pidgin
diff 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 |
line wrap: on
line diff
--- a/libpurple/protocols/oscar/libaim.c Thu Jul 01 17:15:37 2010 +0000 +++ b/libpurple/protocols/oscar/libaim.c Thu Jul 01 18:56:17 2010 +0000 @@ -25,6 +25,7 @@ */ #include "oscarcommon.h" +#include "oscar.h" static PurplePluginProtocolInfo prpl_info = { @@ -57,7 +58,7 @@ oscar_add_deny, /* add_deny */ oscar_rem_permit, /* rem_permit */ oscar_rem_deny, /* rem_deny */ - oscar_set_permit_deny, /* set_permit_deny */ + oscar_set_aim_permdeny, /* set_permit_deny */ oscar_join_chat, /* join_chat */ NULL, /* reject_chat */ oscar_get_chat_name, /* get_chat_name */