Mercurial > pidgin
diff libpurple/plugins/psychic.c @ 17977:f71bd7e56389
propagate from branch 'im.pidgin.pidgin' (head b438ea0760758dc547f95d62892455f50ee4c4f1)
to branch 'im.pidgin.soc.2007.remotelogging' (head 7e683fd40634aa3eb22dcf25cbd25c8959d76662)
| author | Michael Shkutkov <mshkutkov@soc.pidgin.im> |
|---|---|
| date | Sat, 09 Jun 2007 12:01:29 +0000 |
| parents | 56042b2f8b64 |
| children | 941965d6fd88 |
line wrap: on
line diff
--- a/libpurple/plugins/psychic.c Sun Apr 22 11:11:49 2007 +0000 +++ b/libpurple/plugins/psychic.c Sat Jun 09 12:01:29 2007 +0000 @@ -9,6 +9,7 @@ #include "signals.h" #include "status.h" #include "version.h" +#include "privacy.h" #include "plugin.h" #include "pluginpref.h" @@ -20,7 +21,7 @@ #define PLUGIN_SUMMARY N_("Psychic mode for incoming conversation") #define PLUGIN_DESC N_("Causes conversation windows to appear as other" \ " users begin to message you. This works for" \ - " AIM, ICQ, Jabber, Sametime, and Yahoo!") + " AIM, ICQ, XMPP, Sametime, and Yahoo!") #define PLUGIN_AUTHOR "Christopher O'Brien <siege@preoccupied.net>" @@ -47,6 +48,11 @@ return; } + if(FALSE == purple_privacy_check(acct, name)) { + purple_debug_info("psychic", "user %s is blocked", name); + return; + } + gconv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, name, acct); if(! gconv) { purple_debug_info("psychic", "no previous conversation exists\n"); @@ -120,6 +126,12 @@ get_plugin_pref_frame, 0, /* page_num (Reserved) */ NULL, /* frame (Reserved) */ + + /* padding */ + NULL, + NULL, + NULL, + NULL }; @@ -149,6 +161,12 @@ NULL, /**< extra_info */ &prefs_info, /**< prefs_info */ NULL, /**< actions */ + + /* padding */ + NULL, + NULL, + NULL, + NULL };