Changes in irc_im.c [1aacef41:5535a47]

File:

• irc_im.c (modified) (7 diffs)

irc_im.c

@@ -50 +50 @@
 
         memset(nick, 0, MAX_NICK_LENGTH + 1);
-        strcpy(nick, nick_get(bu));
+        strncpy(nick, nick_get(bu), MAX_NICK_LENGTH);
 
         bu->ui_data = iu = irc_user_new(irc, nick);
@@ -576 +576 @@
         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;
@@ -608 +600 @@
         c->ui_data = NULL;
         irc_channel_del_user(ic, ic->irc->user, IRC_CDU_KICK, "Chatroom closed by server");
-
-        return TRUE;
-}
-
-static gboolean bee_irc_chat_placeholder_new(bee_t *bee, struct im_connection *ic, const char *handle,
-                                             const char *name, const char *topic)
-{
-        irc_t *irc = bee->ui_data;
-        irc_channel_t *ircc;
-        char *full_name = irc_channel_name_gen(irc, name);
-
-        ircc = irc_channel_new(irc, full_name);
-
-        set_setstr(&ircc->set, "type", "chat");
-        set_setstr(&ircc->set, "chat_type", "placeholder");
-        set_setstr(&ircc->set, "account", ic->acc->tag);
-        set_setstr(&ircc->set, "room", (char *) handle);
-
-        irc_channel_set_topic(ircc, topic, NULL);
-
-        g_free(full_name);
 
         return TRUE;
@@ -752 +723 @@
                         g_free(channel);
                         channel = s;
+                } else {
+                        g_free(s);
                 }
         }
@@ -853 +826 @@
 static gboolean bee_irc_channel_chat_join(irc_channel_t *ic)
 {
-        char *acc_s, *room, *chat_type;
+        char *acc_s, *room;
         account_t *acc;
 
-        chat_type = set_getstr(&ic->set, "chat_type");
-
-        if (strcmp(chat_type, "room") != 0 && strcmp(chat_type, "placeholder") != 0) {
+        if (strcmp(set_getstr(&ic->set, "chat_type"), "room") != 0) {
                 return TRUE;
         }
@@ -1014 +985 @@
         struct irc_channel *ic = set->data;
 
-        ic->flags &= ~(IRC_CHANNEL_TEMP | IRC_CHANNEL_KEEP_PLACEHOLDER);
-
         if (strcmp(value, "groupchat") == 0) {
                 ic->flags |= IRC_CHANNEL_TEMP;
         } else if (strcmp(value, "room") == 0) {
-                // beep boop
-        } else if (strcmp(value, "placeholder") == 0) {
-                ic->flags |= IRC_CHANNEL_TEMP | IRC_CHANNEL_KEEP_PLACEHOLDER;
+                ic->flags &= ~IRC_CHANNEL_TEMP;
         } else {
                 return NULL;
@@ -1105 +1072 @@
         bee_irc_chat_new,
         bee_irc_chat_free,
-        bee_irc_chat_placeholder_new,
         bee_irc_chat_log,
         bee_irc_chat_msg,