changeset 16683:7bb4bc24b14e

merge of 'f2502546776334781d5c7e707d5fa38a4dcd9c9e' and 'f9ffb98f1b97a42bf470abbf7499641e4ece098c'
author Richard Laager <rlaager@wiktel.com>
date Sun, 29 Apr 2007 22:22:16 +0000
parents 171acd9ebb1a (current diff) fc39fa0afdc8 (diff)
children 9702a1c87d64
files
diffstat 1 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/plugins/psychic.c	Sun Apr 29 22:22:12 2007 +0000
+++ b/libpurple/plugins/psychic.c	Sun Apr 29 22:22:16 2007 +0000
@@ -9,6 +9,7 @@
 #include "signals.h"
 #include "status.h"
 #include "version.h"
+#include "privacy.h"
 
 #include "plugin.h"
 #include "pluginpref.h"
@@ -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");