Changeset 50e1776 for irc.c

Timestamp:

2007-11-19T22:23:58Z (16 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

ef5c185

Parents:

ebb95b6

Message:

Merging /TOPIC code from Miklos Vajna. Untested, because I still have to
implement the Jabber hooks.

File:

• irc.c (modified) (1 diff)

irc.c

@@ -788 +788 @@
 void irc_topic( irc_t *irc, char *channel )
 {
-        if( g_strcasecmp( channel, irc->channel ) == 0 )
-        {
+        struct groupchat *c = irc_chat_by_channel( irc, channel );
+        
+        if( c && c->topic )
+                irc_reply( irc, 332, "%s :%s", channel, c->topic );
+        else if( g_strcasecmp( channel, irc->channel ) == 0 )
                 irc_reply( irc, 332, "%s :%s", channel, CONTROL_TOPIC );
-        }
         else
-        {
-                struct groupchat *c = irc_chat_by_channel( irc, channel );
-                
-                if( c )
-                        irc_reply( irc, 332, "%s :BitlBee groupchat: \"%s\". Please keep in mind that root-commands won't work here. Have fun!", channel, c->title );
-                else
-                        irc_reply( irc, 331, "%s :No topic for this channel", channel );
-        }
+                irc_reply( irc, 331, "%s :No topic for this channel", channel );
 }