X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=list.c;h=cd7fa14c0656bf45dc8e5aee8073e041113469e3;hb=9e5f6d00416e4107a5c1b1e30874a2a0119e0f08;hp=5bb6753a4d7be745bd82e6cc565427e629c68cd3;hpb=b8966ec4ee3c9d035850ff49aaf5485081fe0d20;p=pkg%2Fabook.git

diff --git a/list.c b/list.c
index 5bb6753..cd7fa14 100644
--- a/list.c
+++ b/list.c
@@ -35,14 +35,12 @@ extern struct abook_field abook_fields[];
 WINDOW *list = NULL;
 
 static int
-init_extra_field(char *option_name)
+init_extra_field(enum str_opts option)
 {
 	int i, ret = -1;
 	char *option_str;
 
-	assert(option_name != NULL);
-	
-	option_str = options_get_str(option_name);
+	option_str = opt_get_str(option);
 
 	if(option_str && *option_str) {
 		for(i = 0; i < ITEM_FIELDS; i++) {
@@ -69,8 +67,8 @@ init_list()
 	 * init extra_column and extra alternative
 	 */
 
-	extra_column = init_extra_field("extra_column");
-	extra_alternative = init_extra_field("extra_alternative");
+	extra_column = init_extra_field(STR_EXTRA_COLUMN);
+	extra_alternative = init_extra_field(STR_EXTRA_ALTERNATIVE);
 }
 
 void
@@ -131,7 +129,7 @@ print_list_line(int i, int line, int highlight)
 		mvwaddch(list, line, 0, '*' );
 	
 	mvwaddnstr(list, line, NAMEPOS, database[i][NAME], NAMELEN);
-	if( options_get_int( "show_all_emails"  ) )
+	if( opt_get_bool(BOOL_SHOW_ALL_EMAILS) )
 		mvwaddnstr(list, line, EMAILPOS, database[i][EMAIL],
 				real_emaillen);
 	else {