Changes in irc_im.c [eee3a5a:5ebff60]

File:

• irc_im.c (modified) (1 diff)

irc_im.c

@@ -573 +573 @@
         ic->data = c;
 
-        if (ic->topic == NULL) {
-                /* New channel with no preset topic - make up a generic one */
-                topic = g_strdup_printf(
-                        "BitlBee groupchat: \"%s\". Please keep in mind that root-commands won't work here. Have fun!",
-                        c->title);
-                irc_channel_set_topic(ic, topic, irc->root);
-        } else {
-                /* Preset topic from the channel we picked */
-                topic = g_strdup(ic->topic);
-        }
-
-        g_free(c->topic);
-        c->topic = topic;         /* Let groupchat borrow this pointer */
+        topic = g_strdup_printf(
+                "BitlBee groupchat: \"%s\". Please keep in mind that root-commands won't work here. Have fun!",
+                c->title);
+        irc_channel_set_topic(ic, topic, irc->root);
+        g_free(topic);
 
         return TRUE;