From 3945a72484e3790d2f1259e8c2d418a2258a6721 Mon Sep 17 00:00:00 2001 From: James Booth Date: Sun, 21 Apr 2013 01:37:44 +0100 Subject: [PATCH] Moved cons_show_time() to console module --- src/ui/console.c | 46 ++++++++++++++++++++++++++-------------------- src/ui/windows.c | 6 ------ 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/ui/console.c b/src/ui/console.c index 1f31248f..57fd063f 100644 --- a/src/ui/console.c +++ b/src/ui/console.c @@ -65,6 +65,12 @@ cons_refresh(void) } } +void +cons_show_time(void) +{ + window_show_time(console, '-'); +} + void cons_show(const char * const msg, ...) { @@ -80,6 +86,26 @@ cons_show(const char * const msg, ...) dirty = TRUE; } +void +cons_bad_show(const char * const msg, ...) +{ + va_list arg; + va_start(arg, msg); + GString *fmt_msg = g_string_new(NULL); + g_string_vprintf(fmt_msg, msg, arg); + window_show_time(console, '-'); + wattron(console->win, COLOUR_ERROR); + wprintw(console->win, "%s\n", fmt_msg->str); + wattroff(console->win, COLOUR_ERROR); + g_string_free(fmt_msg, TRUE); + va_end(arg); + + dirty = TRUE; + if (!win_current_is_console()) { + status_bar_new(0); + } +} + void cons_about(void) { @@ -1141,26 +1167,6 @@ cons_show_contacts(GSList *list) } } -void -cons_bad_show(const char * const msg, ...) -{ - va_list arg; - va_start(arg, msg); - GString *fmt_msg = g_string_new(NULL); - g_string_vprintf(fmt_msg, msg, arg); - window_show_time(console, '-'); - wattron(console->win, COLOUR_ERROR); - wprintw(console->win, "%s\n", fmt_msg->str); - wattroff(console->win, COLOUR_ERROR); - g_string_free(fmt_msg, TRUE); - va_end(arg); - - dirty = TRUE; - if (!win_current_is_console()) { - status_bar_new(0); - } -} - static void _cons_splash_logo(void) { diff --git a/src/ui/windows.c b/src/ui/windows.c index c027eed2..52db5b2c 100644 --- a/src/ui/windows.c +++ b/src/ui/windows.c @@ -1145,12 +1145,6 @@ win_room_show_status(const char * const contact) } } -void -cons_show_time(void) -{ - window_show_time(console, '-'); -} - void cons_debug(const char * const msg, ...) {