added an entry about palmcsv format

[pkg/abook.git] / ui.c

diff --git a/ui.c b/ui.c
index b15d8ba1f756d0e59d03baa2ff94f754e187ad8b..023f20667b730f5a25dbae7f3640d71ccf013440 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,7 +238,7 @@ 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;
@@ -250,9 +249,6 @@ ui_readline(char *prompt, char *s, int limit, int use_completion)
 
        ret = abook_readline(bottom, y, x, s, limit, use_completion);
 
-       if(ret && !*ret)
-               my_free(ret);
-
        if(ret)
                strtrim(ret);
 
@@ -424,8 +420,9 @@ get_commands()
 
                        case 'o': ui_open_datafile();   break;
 
-                       case 's': sort_database();      break;
+                       case 's': sort_by_field(NAME);  break;
                        case 'S': sort_surname();       break;
+                       case 'F': sort_by_field(-1);    break;
 
                        case '/': ui_find(0);           break;
                        case '\\': ui_find(1);          break;
@@ -541,7 +538,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() )
@@ -589,7 +586,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();