From a607b29d4aa2e7c55b2a1233b35dfecca87c89fb Mon Sep 17 00:00:00 2001 From: James Booth Date: Wed, 16 Jul 2014 22:20:23 +0100 Subject: Replaced NO_EOL_DATE with bitwise or --- src/ui/core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/ui/core.c') diff --git a/src/ui/core.c b/src/ui/core.c index 53a36f2d..59329c05 100644 --- a/src/ui/core.c +++ b/src/ui/core.c @@ -1378,7 +1378,7 @@ _ui_duck_result(const char * const result) } else { gchar *string = g_ucs4_to_utf8(&unichar, 1, NULL, NULL, NULL); if (string != NULL) { - win_save_print(window, '-', NULL, NO_EOL_DATE, 0, "", string); + win_save_print(window, '-', NULL, NO_DATE | NO_EOL, 0, "", string); g_free(string); } } @@ -1477,7 +1477,7 @@ _ui_room_roster(const char * const room, GList *roster, const char * const prese if (presence == NULL) { length++; win_save_vprint(window, '!', NULL, NO_EOL, COLOUR_ROOMINFO, "", "%d participants: ", length); - win_save_vprint(window, '!', NULL, NO_EOL_DATE, COLOUR_ONLINE, "", "%s, ", muc_get_room_nick(room)); + win_save_vprint(window, '!', NULL, NO_DATE | NO_EOL, COLOUR_ONLINE, "", "%s, ", muc_get_room_nick(room)); } else { win_save_vprint(window, '!', NULL, NO_EOL, COLOUR_ROOMINFO, "", "%d %s: ", length, presence); } @@ -1488,10 +1488,10 @@ _ui_room_roster(const char * const room, GList *roster, const char * const prese const char *show = p_contact_presence(member); int presence_colour = win_presence_colour(show); - win_save_vprint(window, '!', NULL, NO_EOL_DATE, COLOUR_ONLINE|presence_colour, "", "%s", nick); + win_save_vprint(window, '!', NULL, NO_DATE | NO_EOL, COLOUR_ONLINE|presence_colour, "", "%s", nick); if (roster->next != NULL) { - win_save_print(window, '!', NULL, NO_EOL_DATE, COLOUR_ONLINE, "", ", "); + win_save_print(window, '!', NULL, NO_DATE | NO_EOL, COLOUR_ONLINE, "", ", "); } roster = g_list_next(roster); -- cgit 1.4.1-2-gfad0