Changeset eee3a5a

Timestamp:

2015-02-21T06:14:06Z (10 years ago)

Author:

dequis <dx@…>

Children:

59c1fe7

Parents:

75ad761

git-author:

dequis <dx@…> (29-07-14 15:51:51)

git-committer:

dequis <dx@…> (21-02-15 06:14:06)

Message:

Preset topic in groupchat if it's in irc_channel already

File:

• irc_im.c (modified) (1 diff)

irc_im.c

@@ -573 +573 @@
         ic->data = c;
 
-        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);
+        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 */
 
         return TRUE;