Autotools update to autoconf-2.68 / automake-1.11 / gettextize 0.18.1.

[pkg/abook.git] / abook.c

diff --git a/abook.c b/abook.c
index ae69a029987b5874aa55d7c9f44adb8d61d7fde5..ab65d17a784798a44ee9c40885612fde2196ec42 100644 (file)
--- a/abook.c
+++ b/abook.c
@@ -132,6 +132,8 @@ init_abook()
 
        signal(SIGTERM, quit_abook_sig);
 
+       init_index();
+
        if(init_ui())
                exit(EXIT_FAILURE);
 
@@ -185,9 +187,11 @@ int
 main(int argc, char **argv)
 {
 #if defined(HAVE_SETLOCALE) && defined(HAVE_LOCALE_H)
-       setlocale(LC_ALL, "");
+       setlocale(LC_MESSAGES, "");
+       setlocale(LC_TIME, "");
+       setlocale(LC_CTYPE, "");
+       setlocale(LC_COLLATE, "");
 #endif
-
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
 
@@ -446,8 +450,10 @@ static void
 muttq_print_item(FILE *file, int item)
 {
        abook_list *emails, *e;
+       char *tmp = db_email_get(item);
 
-       emails = csv_to_abook_list(db_email_get(item));
+       emails = csv_to_abook_list(tmp);
+       free(tmp);
 
        for(e = emails; e; e = e->next) {
                fprintf(file, "%s\t%s\t%s\n", e->data, db_name_get(item),
@@ -510,7 +516,7 @@ make_mailstr(int item)
 
        get_first_email(email, item);
 
-       ret = *db_email_get(item) ?
+       ret = *email ?
                strdup_printf("%s <%s>", name, email) :
                xstrdup(name);