diff options
| author | James Booth <boothj5@gmail.com> | 2014-10-26 20:53:33 +0000 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2014-10-26 20:53:33 +0000 |
| commit | d7911664e1fe0a000c06b5cf953992745341a56a (patch) | |
| tree | 91f8a275e4190274e00125f167ee7ff50d622d11 /src/ui | |
| parent | be7c4f5a0051b61252001c5ae6cf46eed63b3bc0 (diff) | |
| parent | fea8945953056012926285ecd7205b69e2a520e6 (diff) | |
| download | profani-tty-d7911664e1fe0a000c06b5cf953992745341a56a.tar.gz | |
Merge branch 'master' into symlinks
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/core.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/ui/core.c b/src/ui/core.c index c6971aca..f50ad982 100644 --- a/src/ui/core.c +++ b/src/ui/core.c @@ -1824,7 +1824,7 @@ _ui_room_requires_config(const char * const room_jid) win_save_print(window, '-', NULL, 0, 0, "", ""); win_save_vprint(window, '!', NULL, 0, COLOUR_ROOMINFO, "", - "Room requires configuration."); + "Room locked, requires configuration."); win_save_vprint(window, '!', NULL, 0, COLOUR_ROOMINFO, "", "Use '/room accept' to accept the defaults"); win_save_vprint(window, '!', NULL, 0, COLOUR_ROOMINFO, "", @@ -1841,8 +1841,6 @@ _ui_room_requires_config(const char * const room_jid) } else { status_bar_new(num); } - - cons_show("Room created, locked: %s (%d)", room_jid, ui_index); } } @@ -2558,7 +2556,8 @@ static void _ui_show_form(ProfWin *window, const char * const room, DataForm *form) { if (form->title != NULL) { - win_save_print(window, '-', NULL, 0, 0, "", form->title); + win_save_print(window, '-', NULL, NO_EOL, 0, "", "Form title: "); + win_save_print(window, '-', NULL, NO_DATE, 0, "", form->title); } else { win_save_vprint(window, '-', NULL, 0, 0, "", "Configuration for room %s.", room); } @@ -2609,9 +2608,9 @@ _ui_handle_room_configuration(const char * const room, DataForm *form) ui_show_form(window, room, form); win_save_print(window, '-', NULL, 0, 0, "", ""); - win_save_print(window, '-', NULL, 0, COLOUR_ROOMINFO, "", "Use '/form submit' to save changes."); - win_save_print(window, '-', NULL, 0, COLOUR_ROOMINFO, "", "Use '/form cancel' to cancel changes."); - win_save_print(window, '-', NULL, 0, COLOUR_ROOMINFO, "", "See '/form help' for more information."); + win_save_print(window, '-', NULL, 0, 0, "", "Use '/form submit' to save changes."); + win_save_print(window, '-', NULL, 0, 0, "", "Use '/form cancel' to cancel changes."); + win_save_print(window, '-', NULL, 0, 0, "", "See '/form help' for more information."); win_save_print(window, '-', NULL, 0, 0, "", ""); } |