From: Michael Poole <mdpoole@troilus.org>
Date: Sat, 23 Dec 2006 05:38:37 +0000 (+0000)
Subject: Revert miscommitted file from patch-73.
X-Git-Tag: v1.4.0-rc1~80
X-Git-Url: http://git.pk910.de/?p=srvx.git;a=commitdiff_plain;h=e5ffb9375a75f74c7783578ad19ee68007881110

Revert miscommitted file from patch-73.

src/proto-common.c: Revert accidentally committed patch.
git-archimport-id: srvx@srvx.net--2006/srvx--devo--1.3--patch-76
---

diff --git a/ChangeLog b/ChangeLog
index 6c8476b..93a24a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,19 @@
 # arch-tag: automatic-ChangeLog--srvx@srvx.net--2006/srvx--devo--1.3
 #
 
+2006-12-23 05:38:37 GMT	Michael Poole <mdpoole@troilus.org>	patch-76
+
+    Summary:
+      Revert miscommitted file from patch-73.
+    Revision:
+      srvx--devo--1.3--patch-76
+
+    src/proto-common.c: Revert accidentally committed patch.
+
+    modified files:
+     ChangeLog src/proto-common.c
+
+
 2006-12-23 05:37:07 GMT	Michael Poole <mdpoole@troilus.org>	patch-75
 
     Summary:
diff --git a/src/proto-common.c b/src/proto-common.c
index f681a6a..a20e674 100644
--- a/src/proto-common.c
+++ b/src/proto-common.c
@@ -439,9 +439,9 @@ privmsg_chan_helper(struct chanNode *cn, void *data)
     if ((mn = GetUserMode(cn, pd->user)))
         mn->idle_since = now;
 
-    if (cf->func && !pd->is_notice
-        && (GetUserMode(cn, cf->service) && !IsDeaf(cf->service)))
-        cf->func(pd->user, cn, pd->text+1, cf->service);
+    /* Never send a NOTICE to a channel to one of the services */
+    if (!pd->is_notice && cf->func
+        && ((cn->modes & MODE_REGISTERED) || GetUserMode(cn, cf->service)))
 
     /* This catches *all* text sent to the channel that the services server sees */
     for (x = 0; x < ALLCHANMSG_FUNCS_MAX; x++) {