From: Michael Poole <mdpoole@troilus.org>
Date: Sat, 23 Dec 2006 05:33:28 +0000 (+0000)
Subject: Fix typo in "gtrace criteria" help entry.
X-Git-Tag: v1.4.0-rc1~83
X-Git-Url: http://git.pk910.de/?p=srvx.git;a=commitdiff_plain;h=4df8d406ca10e2f2d666ec90c86701566914e364

Fix typo in "gtrace criteria" help entry.

src/opserv.help (gtrace criteria): Fix capitalization of $b tag.
git-archimport-id: srvx@srvx.net--2006/srvx--devo--1.3--patch-73
---

diff --git a/ChangeLog b/ChangeLog
index 81dac93..293157f 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:33:28 GMT	Michael Poole <mdpoole@troilus.org>	patch-73
+
+    Summary:
+      Fix typo in "gtrace criteria" help entry.
+    Revision:
+      srvx--devo--1.3--patch-73
+
+    src/opserv.help (gtrace criteria): Fix capitalization of $b tag.
+
+    modified files:
+     ChangeLog src/proto-common.c
+
+
 2006-12-23 05:31:56 GMT	Michael Poole <mdpoole@troilus.org>	patch-72
 
     Summary:
diff --git a/src/proto-common.c b/src/proto-common.c
index daf4b86..f681a6a 100644
--- a/src/proto-common.c
+++ b/src/proto-common.c
@@ -439,9 +439,8 @@ privmsg_chan_helper(struct chanNode *cn, void *data)
     if ((mn = GetUserMode(cn, pd->user)))
         mn->idle_since = now;
 
-    /* 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)))
+    if (cf->func && !pd->is_notice
+        && (GetUserMode(cn, cf->service) && !IsDeaf(cf->service)))
         cf->func(pd->user, cn, pd->text+1, cf->service);
 
     /* This catches *all* text sent to the channel that the services server sees */