Changeset 7a9d968 for irc_im.c

Timestamp:

2018-03-10T11:30:39Z (7 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

5447c59

Parents:

3f44e43 (diff), 4a9c6b0 (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:

Merge branch 'master' into HEAD

File:

• irc_im.c (modified) (2 diffs)

irc_im.c

@@ -89 +89 @@
 
         if (bu->flags & BEE_USER_LOCAL) {
-                char *s = set_getstr(&bee->set, "handle_unknown");
-
-                if (strcmp(s, "add_private") == 0) {
+                char *s = set_getstr(&bu->ic->acc->set, "handle_unknown") ? :
+                          set_getstr(&bee->set, "handle_unknown");
+
+                if (g_strcasecmp(s, "add_private") == 0) {
                         iu->last_channel = NULL;
-                } else if (strcmp(s, "add_channel") == 0) {
+                } else if (g_strcasecmp(s, "add_channel") == 0) {
                         iu->last_channel = irc->default_channel;
                 }
@@ -634 +635 @@
         }
 
-        if (ic->flags & IRC_CHANNEL_JOINED) {
-                irc_channel_printf(ic, "Cleaning up channel, bye!");
-        }
-
         ic->data = NULL;
         c->ui_data = NULL;