From 95f24091f65943c69617bc462ee2175b8cfe257f Mon Sep 17 00:00:00 2001
From: "Naram Qashat cyberbotx@cyberbotx.com"
 <Naram Qashat cyberbotx@cyberbotx.com@5417fbe8-f217-4b02-8779-1006273d7864>
Date: Thu, 2 Oct 2008 17:46:06 +0000
Subject: Replaced anope_cmd_topic() with direct call to SendTopic() in
 IRCDProto class.

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1323 5417fbe8-f217-4b02-8779-1006273d7864
---
 src/chanserv.c               |  4 ++--
 src/core/cs_topic.c          |  6 +++---
 src/ircd.c                   |  6 ------
 src/modules/cs_appendtopic.c | 12 ++++++------
 4 files changed, 11 insertions(+), 17 deletions(-)

(limited to 'src')

diff --git a/src/chanserv.c b/src/chanserv.c
index b325bf6a6..1c86a73e1 100644
--- a/src/chanserv.c
+++ b/src/chanserv.c
@@ -1452,7 +1452,7 @@ void restore_topic(const char *chan)
             anope_SendMode(NULL, chan, "+o %s", s_ChanServ);
         }
     }
-    anope_cmd_topic(whosends(ci)->nick, c->name, c->topic_setter,
+    ircdproto->SendTopic(whosends(ci)->nick, c->name, c->topic_setter,
                     c->topic ? c->topic : "", c->topic_time);
     if (ircd->join2set) {
         if (whosends(ci) == s_ChanServ) {
@@ -1515,7 +1515,7 @@ int check_topiclock(Channel * c, time_t topic_time)
         }
     }
 
-    anope_cmd_topic(whosends(ci)->nick, c->name, c->topic_setter,
+    ircdproto->SendTopic(whosends(ci)->nick, c->name, c->topic_setter,
                     c->topic ? c->topic : "", c->topic_time);
 
     if (ircd->join2set) {
diff --git a/src/core/cs_topic.c b/src/core/cs_topic.c
index a8c9533a7..7d3ae40c1 100644
--- a/src/core/cs_topic.c
+++ b/src/core/cs_topic.c
@@ -6,8 +6,8 @@
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church. 
- * 
+ * Based on the original code of Services by Andy Church.
+ *
  * $Id$
  *
  */
@@ -107,7 +107,7 @@ int do_cs_topic(User * u)
                 anope_SendMode(NULL, c->name, "+o %s", s_ChanServ);
             }
         }
-        anope_cmd_topic(whosends(ci), c->name, u->nick, topic ? topic : "",
+        ircdproto->SendTopic(whosends(ci), c->name, u->nick, topic ? topic : "",
                         c->topic_time);
         if (ircd->join2set) {
             if (whosends(ci) == s_ChanServ) {
diff --git a/src/ircd.c b/src/ircd.c
index e82461cf2..5894b86c4 100644
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -43,12 +43,6 @@ void anope_ProcessUsermodes(User *user, int ac, const char **av)
 	ircdproto->ProcessUsermodes(user, ac, av);
 }
 
-void anope_cmd_topic(const char *whosets, const char *chan, const char *whosetit, const char *topic, time_t when)
-{
-	BotInfo *bi = findbot(whosets);
-	ircdproto->SendTopic(bi, chan, whosetit, topic, when);
-}
-
 void anope_SendVhostDel(User *u)
 {
 	ircdproto->SendVhostDel(u);
diff --git a/src/modules/cs_appendtopic.c b/src/modules/cs_appendtopic.c
index 665782c73..08a6e19f2 100644
--- a/src/modules/cs_appendtopic.c
+++ b/src/modules/cs_appendtopic.c
@@ -26,15 +26,15 @@
    * Author: SGR <Alex_SGR@ntlworld.com>
    * Date: 31/08/2003
    * ------------------------------------------------------------
-   * 
+   *
    * This module has no configurable options. For information on
    * this module, load it and refer to /ChanServ APPENDTOPIC HELP
-   * 
-   * Thanks to dengel, Rob and Certus for all there support. 
-   * Especially Rob, who always manages to show me where I have 
+   *
+   * Thanks to dengel, Rob and Certus for all there support.
+   * Especially Rob, who always manages to show me where I have
    * not allocated any memory. Even if it takes a few weeks of
    * pestering to get him to look at it.
-   * 
+   *
    * ------------------------------------------------------------
    */
 
@@ -151,7 +151,7 @@ int my_cs_appendtopic(User * u)
                 anope_SendMode(NULL, c->name, "+o %s", s_ChanServ);
             }
         }
-        anope_cmd_topic(whosends(ci), c->name, u->nick, topic, c->topic_time);
+        ircdproto->SendTopic(whosends(ci), c->name, u->nick, topic, c->topic_time);
         if (ircd->join2set) {
             if (whosends(ci) == s_ChanServ) {
                 anope_SendPart(s_ChanServ, c->name, NULL);
-- 
cgit