Mercurial > pidgin
diff src/protocols/irc/msgs.c @ 9741:b10d4c6ac7eb
[gaim-migrate @ 10606]
(20:26:58) KingAnt: LSchiere: Can you revert it and I'll post some
suggestions to the patch in the tracker?
committer: Tailor Script <tailor@pidgin.im>
author | Luke Schierer <lschiere@pidgin.im> |
---|---|
date | Thu, 12 Aug 2004 00:26:28 +0000 |
parents | 2bb5e2cd64bd |
children | 3f97624e7753 |
line wrap: on
line diff
--- a/src/protocols/irc/msgs.c Wed Aug 11 23:52:48 2004 +0000 +++ b/src/protocols/irc/msgs.c Thu Aug 12 00:26:28 2004 +0000 @@ -28,7 +28,6 @@ #include "util.h" #include "debug.h" #include "irc.h" -#include "privacy.h" #include <stdio.h> @@ -847,8 +846,6 @@ GaimConversation *convo; char *nick = irc_mask_nick(from), *tmp, *msg; int notice = 0; - GSList* l; - gboolean in_deny=0; if (!args || !args[0] || !args[1] || !gc) { g_free(nick); @@ -862,40 +859,6 @@ return; } - - switch (gc->account->perm_deny) { - case GAIM_PRIVACY_ALLOW_ALL: - in_deny = 0; break; - case GAIM_PRIVACY_DENY_ALL: - in_deny = 1; break; - case GAIM_PRIVACY_ALLOW_USERS: /* See if stripped_sender is in gc->account->permit and allow appropriately */ - in_deny = 1; - for(l=gc->account->permit;l!=NULL;l=l->next) { - if (!gaim_utf8_strcasecmp(nick, gaim_normalize(gc->account, (char *)l->data))) { - in_deny=0; - break; - } - } - break; - case GAIM_PRIVACY_DENY_USERS: /* See if nick is in gc->account->deny and deny if so */ - in_deny = 0; - for(l=gc->account->deny;l!=NULL;l=l->next) { - if (!gaim_utf8_strcasecmp(nick, gaim_normalize(gc->account, (char *)l->data))) { - in_deny=1; - break; - } - } - break; - case GAIM_PRIVACY_ALLOW_BUDDYLIST: - in_deny = 1; - if (gaim_find_buddy(gc->account,nick)!=NULL) { - in_deny = 0; - } - break; - default: - in_deny=0; break; - } - msg = gaim_escape_html(tmp); g_free(tmp); @@ -909,13 +872,9 @@ } if (!gaim_utf8_strcasecmp(args[0], gaim_connection_get_display_name(gc))) { - if (!in_deny) { serv_got_im(gc, nick, msg, 0, time(NULL)); - } } else if (notice) { - if(!in_deny) { serv_got_im(gc, nick, msg, 0, time(NULL)); - } } else { convo = gaim_find_conversation_with_account(args[0], irc->account); if (convo)