summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeert Hauwaerts <geert@hauwaerts.be>2014-07-08 12:00:45 +0200
committerGeert Hauwaerts <geert@hauwaerts.be>2014-07-08 12:00:45 +0200
commit05979c8d9f67cac7a80b496dc4e87b98df846399 (patch)
tree9a2ac5851d7f825248f6ac16ce39ee35c502355f
parent31da4e86237a51dcd73db4991c2697921731f05a (diff)
parent7fe47826ea5b8015ba81f2eabf2af750c7f56a47 (diff)
downloadirssi-05979c8d9f67cac7a80b496dc4e87b98df846399.zip
Merge pull request #88 from dgl/banner
Only show the banner when not connecting to servers
-rw-r--r--src/fe-text/irssi.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/fe-text/irssi.c b/src/fe-text/irssi.c
index a77ded49..c0524247 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"
@@ -95,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"
"- - - - - - - - - - - - - - - - - - - - - - - - - - - -";
@@ -205,12 +206,14 @@ 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,
- "%s", firsttimer_text);
+ printtext(NULL, NULL, MSGLEVEL_CRAP|MSGLEVEL_NO_ACT,
+ "%s", firsttimer_text);
}
}