From 47d66d214f426ac191b92dc5c3739783d852d8f0 Mon Sep 17 00:00:00 2001 From: David Leadbeater Date: Tue, 8 Jul 2014 01:38:08 +0100 Subject: [PATCH 1/3] Only show banner if not connecting to servers It's tricky to make the banner show first in all cases and it's unlikely to be seen if someone is connecting to a server already, so just don't show it. --- src/fe-text/irssi.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/fe-text/irssi.c b/src/fe-text/irssi.c index a77ded49..4dda7d39 100644 --- a/src/fe-text/irssi.c +++ b/src/fe-text/irssi.c @@ -27,6 +27,7 @@ #include "core.h" #include "settings.h" #include "session.h" +#include "servers.h" #include "printtext.h" #include "fe-common-core.h" @@ -205,8 +206,10 @@ static void textui_finish_init(void) signal_emit("irssi init finished", 0); statusbar_redraw(NULL, TRUE); - printtext_window(active_win, MSGLEVEL_CRAP, - "%s", banner_text); + if (servers == NULL && lookup_servers == NULL) { + printtext(NULL, NULL, MSGLEVEL_CRAP|MSGLEVEL_NO_ACT, + "%s", banner_text); + } if (display_firsttimer) { printtext_window(active_win, MSGLEVEL_CRAP, From 4e2299f1b702f84fab738a51ce9eed32c2826bc3 Mon Sep 17 00:00:00 2001 From: David Leadbeater Date: Tue, 8 Jul 2014 09:23:55 +0100 Subject: [PATCH 2/3] Change to printtext for first time message too --- src/fe-text/irssi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/fe-text/irssi.c b/src/fe-text/irssi.c index 4dda7d39..1004f515 100644 --- a/src/fe-text/irssi.c +++ b/src/fe-text/irssi.c @@ -212,8 +212,8 @@ static void textui_finish_init(void) } if (display_firsttimer) { - printtext_window(active_win, MSGLEVEL_CRAP, - "%s", firsttimer_text); + printtext(NULL, NULL, MSGLEVEL_CRAP|MSGLEVEL_NO_ACT, + "%s", firsttimer_text); } } From 7fe47826ea5b8015ba81f2eabf2af750c7f56a47 Mon Sep 17 00:00:00 2001 From: David Leadbeater Date: Tue, 8 Jul 2014 09:24:12 +0100 Subject: [PATCH 3/3] Suggest /HELP rather than HELP At this point cmdchars is definitely / and the user might not know they need to add / to a command. --- src/fe-text/irssi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fe-text/irssi.c b/src/fe-text/irssi.c index 1004f515..c0524247 100644 --- a/src/fe-text/irssi.c +++ b/src/fe-text/irssi.c @@ -96,7 +96,7 @@ static const char *firsttimer_text = "documentation to get you going.\n\n" "Our community and staff are available to assist you or\n" "to answer any questions you may have.\n\n" - "Use the HELP command to get detailed information about\n" + "Use the /HELP command to get detailed information about\n" "the available commands.\n" "- - - - - - - - - - - - - - - - - - - - - - - - - - - -";