Changes in root_commands.c [b441614:5ebff60]

File:

• root_commands.c (modified) (7 diffs)

root_commands.c

@@ -460 +460 @@
 
                 for (a = irc->b->accounts; a; a = a->next) {
-                        char *con = NULL, *protocol = NULL;
+                        char *con;
 
                         if (a->ic && (a->ic->flags & OPT_LOGGED_IN)) {
@@ -471 +471 @@
                                 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);
+
+                        irc_rootmsg(irc, "%2d (%s): %s, %s%s", i, a->tag, a->prpl->name, a->user, con);
 
                         i++;
@@ -492 +486 @@
 
                         for (a = irc->b->accounts; a; a = a->next) {
-                                if (!a->ic && a->auto_connect && a->prpl != &protocol_missing) {
+                                if (!a->ic && a->auto_connect) {
                                         if (strcmp(a->pass, PASSWORD_PENDING) == 0) {
                                                 irc_rootmsg(irc, "Enter password for account %s "
@@ -549 +543 @@
                         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);
@@ -656 +647 @@
                 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 (cmd[3]) {
+                if (!nick_ok(irc, cmd[3])) {
+                        irc_rootmsg(irc, "The requested nick `%s' is invalid", cmd[3]);
+                        return;
+                } else if (irc_user_by_name(irc, cmd[3])) {
+                        irc_rootmsg(irc, "The requested nick `%s' already exists", cmd[3]);
+                        return;
+                } else {
+                        nick_set_raw(a, cmd[2], cmd[3]);
+                }
         }
 
@@ -674 +674 @@
         }
 
-        if (cmd[3]) {
-                if (!nick_ok(irc, cmd[3])) {
-                        irc_rootmsg(irc, "The requested nick `%s' is invalid", cmd[3]);
-                        return;
-                } else if (irc_user_by_name(irc, cmd[3])) {
-                        irc_rootmsg(irc, "The requested nick `%s' already exists", cmd[3]);
-                        return;
-                } else {
-                        nick_set_raw(a, cmd[2], cmd[3]);
-                }
-        }
-
         if (add_on_server) {
                 irc_channel_t *ic;
@@ -729 +717 @@
         s = g_strdup(bu->handle);
 
-        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");
-        }
-
+        bu->ic->acc->prpl->remove_buddy(bu->ic, bu->handle, NULL);
         nick_del(bu);
         if (g_slist_find(irc->users, iu)) {