X-Git-Url: https://git.deb.at/?a=blobdiff_plain;ds=inline;f=list.c;h=00e149ad50b2ffc442a2769d01424ba41654fc2b;hb=2f465ba5e73ba05745d23f0fca9d5bdb1b350d8c;hp=31853a49e4a716d5539c08816c826919f7723caa;hpb=ef379a20d142cb95ba08c7887c8e3245269b3fdd;p=pkg%2Fabook.git diff --git a/list.c b/list.c index 31853a4..00e149a 100644 --- a/list.c +++ b/list.c @@ -14,9 +14,11 @@ #include "ui.h" #include "database.h" #include "edit.h" +#include "gettext.h" #include "list.h" #include "misc.h" #include "options.h" +#include "xmalloc.h" #define MIN_EXTRA_COLUMN ADDRESS /* 2 */ #define MAX_EXTRA_COLUMN LAST_FIELD @@ -32,7 +34,7 @@ extern int items; extern list_item *database; extern struct abook_field abook_fields[]; -WINDOW *list = NULL; +static WINDOW *list = NULL; static int init_extra_field(enum str_opts option) @@ -87,7 +89,7 @@ refresh_list() ui_print_number_of_items(); - if(items < 1) { + if(list_is_empty()) { refresh(); wrefresh(list); return; @@ -163,10 +165,10 @@ list_headerline() #if defined(A_BOLD) && defined(A_NORMAL) attrset(A_BOLD); #endif - mvaddstr(2, NAMEPOS, abook_fields[NAME].name); - mvaddstr(2, EMAILPOS, abook_fields[EMAIL].name); + mvaddstr(2, NAMEPOS, gettext(abook_fields[NAME].name)); + mvaddstr(2, EMAILPOS, gettext(abook_fields[EMAIL].name)); if(extra_column > 0) - mvaddnstr(2, EXTRAPOS, abook_fields[extra_column].name, + mvaddnstr(2, EXTRAPOS, gettext(abook_fields[extra_column].name), COLS-EXTRAPOS); #if defined(A_BOLD) && defined(A_NORMAL) attrset(A_NORMAL); @@ -354,7 +356,7 @@ duplicate_item() return 1; for(i = 0; i < ITEM_FIELDS; i++) - item[i] = database[curitem][i] ? strdup(database[curitem][i]) : + item[i] = database[curitem][i] ? xstrdup(database[curitem][i]) : NULL; if(add_item2database(item))