various updates

[pkg/abook.git] / ui.c

diff --git a/ui.c b/ui.c
index 4103eba78dcaaecdb55d18cc71e6dcddea770a8f..4d4150e1006e5c9883121494af99cf3784ca115f 100644 (file)
--- a/ui.c
+++ b/ui.c
@@ -59,7 +59,6 @@ bool can_resize = FALSE;
 WINDOW *top = NULL, *bottom = NULL;
 
 
-
 static void
 init_windows()
 {
@@ -239,20 +238,21 @@ statusline_addstr(char *str)
 }
 
 char *
-ui_readline(char *prompt, char *s, int limit, int use_completion)
+ui_readline(char *prompt, char *s, int limit, bool use_completion)
 {
        int y, x;
+       char *ret;
 
        mvwaddstr(bottom, 1, 0, prompt);
-       //mvwaddstr(stdscr, LINES - 1, 0, prompt);
 
-       /*
-        * FIXME: stdscr shoulnd't be used ???
-        */
-//     getyx(stdscr, y, x);
        getyx(bottom, y, x);
 
-       return abook_readline(bottom, y, x, s, limit, use_completion);
+       ret = abook_readline(bottom, y, x, s, limit, use_completion);
+
+       if(ret)
+               strtrim(ret);
+
+       return ret;
 }
 
 int
@@ -537,7 +537,7 @@ void
 ui_print_database()
 {
        FILE *handle;
-       char *command = options_get_str("print_command");
+       char *command = opt_get_str(STR_PRINT_COMMAND);
        int mode;
 
        if( list_is_empty() )
@@ -585,7 +585,7 @@ ui_open_datafile()
                return;
        }
 
-       if( options_get_int("autosave") )
+       if( opt_get_bool(BOOL_AUTOSAVE) )
                save_database();
        else if(statusline_ask_boolean("Save current database", FALSE))
                save_database();