Changes in irc_channel.c [f8feb8a:24de9fa]

File:

• irc_channel.c (modified) (3 diffs)

irc_channel.c

@@ -445 +445 @@
                         char *acc_s;
 
-                        if (!aj || (ic->flags & IRC_CHANNEL_JOINED)) {
-                                /* Only continue if this one's marked as auto_join
-                                   or if we're in it already. (Possible if the
-                                   client auto-rejoined it before identyfing.) */
+                        if (!aj && !(ic->flags & IRC_CHANNEL_JOINED)) {
+                                /* Only proceed if this one's marked as auto_join
+                                   or if we're in it already. (Very likely the IRC
+                                   client auto-(re)joining at reconnect time.) */
                                 continue;
                         } else if (!(acc_s = set_getstr(&ic->set, "account"))) {
@@ -724 +724 @@
         }
 
-        if (!bu->ic->acc->prpl->add_buddy) {
-                irc_send_num(ic->irc, 482, "%s :IM protocol does not support contact list modification", ic->name);
-                return FALSE;
-        }
-
         bu->ic->acc->prpl->add_buddy(bu->ic, bu->handle,
                                      icc->group ? icc->group->name : NULL);
@@ -746 +741 @@
         if (icc->type != IRC_CC_TYPE_GROUP) {
                 irc_send_num(ic->irc, 482, "%s :Kicks are only possible to fill_by=group channels", ic->name);
-                return;
-        }
-
-        if (!bu->ic->acc->prpl->remove_buddy) {
-                irc_send_num(ic->irc, 482, "%s :IM protocol does not support contact list modification", ic->name);
                 return;
         }