Fixed /connect and /disconnect commands, improved output of some commands

2 files changed, 3 insertions, 15 deletions

diff --git a/src/irc/irc-commands.c b/src/irc/irc-commands.c
index f6bd3de77..88cc8065b 100644
--- a/src/irc/irc-commands.c
+++ b/src/irc/irc-commands.c
@@ -123,7 +123,7 @@ t_irc_command irc_commands[] =
     "  i: mark a user as invisible\n"
     "  s: mark a user for receive server notices\n"
     "  w: user receives wallops\n"
-    "  o: operator flag\n"),
+    "  o: operator flag"),
     1, MAX_ARGS, 1, NULL, irc_cmd_send_mode, irc_cmd_recv_mode },
   { "motd", N_("get the \"Message Of The Day\""),
     N_("[target]"),
@@ -236,7 +236,7 @@ t_irc_command irc_commands[] =
     1, MAX_ARGS, 1, NULL, irc_cmd_send_wallops, NULL },
   { "who", N_("generate a query which returns a list of information"),
     N_("[mask [\"o\"]]"), N_("mask: only information which match this mask\n"
-    "o: only operators are returned according to the mask supplied\n"),
+    "o: only operators are returned according to the mask supplied"),
     0, 2, 1, NULL, irc_cmd_send_who, NULL },
   { "whois", N_("query information about user(s)"),
     N_("[server] nickname[,nickname]"), N_("server: server name\n"
diff --git a/src/irc/irc-display.c b/src/irc/irc-display.c
index e231027f7..6bcd216b8 100644
--- a/src/irc/irc-display.c
+++ b/src/irc/irc-display.c
@@ -149,7 +149,7 @@ irc_display_mode (t_gui_buffer *buffer, char *channel_name, char set_flag,
 void
 irc_display_server (t_irc_server *server)
 {
-    irc_display_prefix (NULL, PREFIX_INFO);
+    gui_printf (NULL, "\n");
     gui_printf_color (NULL, COLOR_WIN_CHAT, _("Server: "));
     gui_printf_color (NULL, COLOR_WIN_CHAT_CHANNEL, "%s", server->name);
     gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, " [");
@@ -157,58 +157,46 @@ irc_display_server (t_irc_server *server)
                       (server->is_connected) ?
                           _("connected") : _("not connected"));
     gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, "]\n");
-    irc_display_prefix (NULL, PREFIX_INFO);
     gui_printf_color (NULL, COLOR_WIN_CHAT,
                       "  server_autoconnect        : %s%s\n",
                       (server->autoconnect) ? _("yes") : _("no"),
                       (server->command_line) ?
                           _(" (temporary server, will not be saved)") : "");
-    irc_display_prefix (NULL, PREFIX_INFO);
     gui_printf_color (NULL, COLOR_WIN_CHAT,
                       "  server_autoreconnect . . .: %s\n",
                       (server->autoreconnect) ? _("yes") : _("no"));
-    irc_display_prefix (NULL, PREFIX_INFO);
     gui_printf_color (NULL, COLOR_WIN_CHAT,
                       "  server_autoreconnect_delay: %d seconds\n",
                       server->autoreconnect_delay);
-    irc_display_prefix (NULL, PREFIX_INFO);
     gui_printf_color (NULL, COLOR_WIN_CHAT,
                       "  server_address . . . . . .: %s\n",
                       server->address);
-    irc_display_prefix (NULL, PREFIX_INFO);
     gui_printf_color (NULL, COLOR_WIN_CHAT,
                       "  server_port  . . . . . . .: %d\n",
                       server->port);
-    irc_display_prefix (NULL, PREFIX_INFO);
     gui_printf_color (NULL, COLOR_WIN_CHAT,
                       "  server_password  . . . . .: %s\n",
                       (server->password && server->password[0]) ?
                       _("(hidden)") : "");
-    irc_display_prefix (NULL, PREFIX_INFO);
     gui_printf_color (NULL, COLOR_WIN_CHAT,
                       "  server_nick1/2/3 . . . . .: %s", server->nick1);
     gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, " / ");
     gui_printf_color (NULL, COLOR_WIN_CHAT, "%s", server->nick2);
     gui_printf_color (NULL, COLOR_WIN_CHAT_DARK, " / ");
     gui_printf_color (NULL, COLOR_WIN_CHAT, "%s\n", server->nick3);
-    irc_display_prefix (NULL, PREFIX_INFO);
     gui_printf_color (NULL, COLOR_WIN_CHAT,
                       "  server_username  . . . . .: %s\n",
                       server->username);
-    irc_display_prefix (NULL, PREFIX_INFO);
     gui_printf_color (NULL, COLOR_WIN_CHAT,
                       "  server_realname  . . . . .: %s\n",
                       server->realname);
-    irc_display_prefix (NULL, PREFIX_INFO);
     gui_printf_color (NULL, COLOR_WIN_CHAT,
                       "  server_command . . . . . .: %s\n",
                       (server->command && server->command[0]) ?
                       server->command : "");
-    irc_display_prefix (NULL, PREFIX_INFO);
     gui_printf_color (NULL, COLOR_WIN_CHAT,
                       "  server_command_delay . . .: %d seconds\n",
                       server->command_delay);
-    irc_display_prefix (NULL, PREFIX_INFO);
     gui_printf_color (NULL, COLOR_WIN_CHAT,
                       "  server_autojoin  . . . . .: %s\n",
                       (server->autojoin && server->autojoin[0]) ?