Changeset b1dc403 for irc_im.c

Timestamp:

2015-05-04T21:58:50Z (9 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

5726a0d

Parents:

531eabd (diff), 5ca1416 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Catch up with master.

File:

• irc_im.c (modified) (4 diffs)

irc_im.c

@@ -235 +235 @@
                         } else {
                                 /* Modules can swallow messages. */
-                                return TRUE;
+                                goto cleanup;
                         }
                 }
@@ -250 +250 @@
         wrapped = word_wrap(msg, 425);
         irc_send_msg(iu, "PRIVMSG", dst, wrapped, prefix);
-
         g_free(wrapped);
+
+cleanup:
         g_free(prefix);
         g_free(msg);
@@ -291 +292 @@
 
         irc_send_msg((irc_user_t *) bu->ui_data, "NOTICE", irc->user->nick, msg->str, NULL);
+
+        g_string_free(msg, TRUE);
 
         return TRUE;
@@ -693 +696 @@
 static gboolean bee_irc_chat_name_hint(bee_t *bee, struct groupchat *c, const char *name)
 {
-        irc_t *irc = bee->ui_data;
-        irc_channel_t *ic = c->ui_data, *oic;
-        char stripped[MAX_NICK_LENGTH + 1], *full_name;
-
-        if (ic == NULL) {
-                return FALSE;
-        }
-
-        /* Don't rename a channel if the user's in it already. */
-        if (ic->flags & IRC_CHANNEL_JOINED) {
-                return FALSE;
-        }
-
-        strncpy(stripped, name, MAX_NICK_LENGTH);
-        stripped[MAX_NICK_LENGTH] = '\0';
-        irc_channel_name_strip(stripped);
-        if (set_getbool(&bee->set, "lcnicks")) {
-                nick_lc(irc, stripped);
-        }
-
-        if (stripped[0] == '\0') {
-                return FALSE;
-        }
-
-        full_name = g_strdup_printf("#%s", stripped);
-        if ((oic = irc_channel_by_name(irc, full_name))) {
-                char *type, *chat_type;
-
-                type = set_getstr(&oic->set, "type");
-                chat_type = set_getstr(&oic->set, "chat_type");
-
-                if (type && chat_type && oic->data == FALSE &&
-                    strcmp(type, "chat") == 0 &&
-                    strcmp(chat_type, "groupchat") == 0) {
-                        /* There's a channel with this name already, but it looks
-                           like it's not in use yet. Most likely the IRC client
-                           rejoined the channel after a reconnect. Remove it so
-                           we can reuse its name. */
-                        irc_channel_free(oic);
-                } else {
-                        g_free(full_name);
-                        return FALSE;
-                }
-        }
-
-        g_free(ic->name);
-        ic->name = full_name;
-
-        return TRUE;
+        return irc_channel_name_hint(c->ui_data, name);
 }