X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=abook.c;h=42c04c1f37022eceb632739fd38098673867c4a5;hb=84133598d00157f8129b99f4885171539bbfa8f5;hp=ae69a029987b5874aa55d7c9f44adb8d61d7fde5;hpb=4909ba20244f55ee7326a40d751cf6737c2bc2b6;p=pkg%2Fabook.git

diff --git a/abook.c b/abook.c
index ae69a02..42c04c1 100644
--- 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);
 
@@ -704,6 +710,7 @@ init_add_email()
 	check_abook_directory();
 	init_opts();
 	load_opts(rcfile);
+	init_standard_fields();
 	atexit(free_opts);
 
 	/*