Changes in root_commands.c [ad9ac5d:b441614]

File:

• root_commands.c (modified) (10 diffs)

root_commands.c

@@ -163 +163 @@
                 irc_umode_set(irc, "+R", 1);
 
-                if (irc->caps & CAP_SASL) {
-                        irc_user_t *iu = irc->user;
-                        irc_send_num(irc, 900, "%s!%s@%s %s :You are now logged in as %s",
-                                iu->nick, iu->user, iu->host, iu->nick, iu->nick);
-                }
-
                 bitlbee_whatsnew(irc);
 
@@ -244 +238 @@
                 irc->status |= USTATUS_IDENTIFIED;
                 irc_umode_set(irc, "+R", 1);
-
-                if (irc->caps & CAP_SASL) {
-                        irc_user_t *iu = irc->user;
-                        irc_send_num(irc, 900, "%s!%s@%s %s :You are now logged in as %s",
-                                iu->nick, iu->user, iu->host, iu->nick, iu->nick);
-                }
 
                 /* Set this var now, or anyone who logs in to his/her
@@ -425 +413 @@
 
                 if (prpl == NULL) {
-                        if (is_protocol_disabled(cmd[2])) {
-                                irc_rootmsg(irc, "Protocol disabled in global config");
-                        } else {
-                                irc_rootmsg(irc, "Unknown protocol");
-                        }
+                        irc_rootmsg(irc, "Unknown protocol");
                         return;
                 }
@@ -476 +460 @@
 
                 for (a = irc->b->accounts; a; a = a->next) {
-                        char *con;
+                        char *con = NULL, *protocol = NULL;
 
                         if (a->ic && (a->ic->flags & OPT_LOGGED_IN)) {
@@ -487 +471 @@
                                 con = "";
                         }
-
-                        irc_rootmsg(irc, "%2d (%s): %s, %s%s", i, a->tag, a->prpl->name, a->user, con);
+                        if (a->prpl == &protocol_missing) {
+                                protocol = g_strdup_printf("%s (missing!)", set_getstr(&a->set, "_protocol_name"));
+                        } else {
+                                protocol = g_strdup(a->prpl->name);
+                        }
+
+                        irc_rootmsg(irc, "%2d (%s): %s, %s%s", i, a->tag, protocol, a->user, con);
+                        g_free(protocol);
 
                         i++;
@@ -502 +492 @@
 
                         for (a = irc->b->accounts; a; a = a->next) {
-                                if (!a->ic && a->auto_connect) {
+                                if (!a->ic && a->auto_connect && a->prpl != &protocol_missing) {
                                         if (strcmp(a->pass, PASSWORD_PENDING) == 0) {
                                                 irc_rootmsg(irc, "Enter password for account %s "
@@ -559 +549 @@
                         irc_rootmsg(irc, "Enter password for account %s "
                                     "first (use /OPER)", a->tag);
+                } else if (a->prpl == &protocol_missing) {
+                        irc_rootmsg(irc, "Protocol `%s' not recognised (plugin may be missing or not running?)",
+                                    set_getstr(&a->set, "_protocol_name"));
                 } else {
                         account_on(irc->b, a);
@@ -663 +656 @@
                 irc_rootmsg(irc, "That account is not on-line");
                 return;
+        } else if (add_on_server && !a->prpl->add_buddy) {
+                irc_rootmsg(irc, "IM protocol does not support contact list modification");
+                return;
+        }
+
+        if ((a->flags & ACC_FLAG_HANDLE_DOMAINS) && cmd[2][0] != '_' &&
+            (!(s = strchr(cmd[2], '@')) || s[1] == '\0')) {
+                /* If there's no @ or it's the last char, append the user's
+                   domain name now. Exclude handles starting with a _ so
+                   adding _xmlconsole will keep working. */
+                if (s) {
+                        *s = '\0';
+                }
+                if ((s = strchr(a->user, '@'))) {
+                        cmd[2] = handle = g_strconcat(cmd[2], s, NULL);
+                }
         }
 
@@ -677 +686 @@
         }
 
-        if ((a->flags & ACC_FLAG_HANDLE_DOMAINS) && cmd[2][0] != '_' &&
-            (!(s = strchr(cmd[2], '@')) || s[1] == '\0')) {
-                /* If there's no @ or it's the last char, append the user's
-                   domain name now. Exclude handles starting with a _ so
-                   adding _xmlconsole will keep working. */
-                if (s) {
-                        *s = '\0';
-                }
-                if ((s = strchr(a->user, '@'))) {
-                        cmd[2] = handle = g_strconcat(cmd[2], s, NULL);
-                }
-        }
-
         if (add_on_server) {
                 irc_channel_t *ic;
@@ -733 +729 @@
         s = g_strdup(bu->handle);
 
-        bu->ic->acc->prpl->remove_buddy(bu->ic, bu->handle, NULL);
+        if (bu->ic->acc->prpl->remove_buddy) {
+                bu->ic->acc->prpl->remove_buddy(bu->ic, bu->handle, NULL);
+        } else {
+                irc_rootmsg(irc, "IM protocol does not support contact list modification, "
+                                 "removal will likely not be permanent");
+        }
+
         nick_del(bu);
         if (g_slist_find(irc->users, iu)) {