X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;ds=sidebyside;f=list.c;h=d349209582f31f44df74ccae33045a623b8d8dfc;hb=ba9b9ffc6eb621ca0094db55f571010f5f5603ed;hp=67c7c3d55d449e423ac32ee846332ca442785284;hpb=6e7d84045e274f26479ade3604b381c381e477dc;p=pkg%2Fabook.git

diff --git a/list.c b/list.c
index 67c7c3d..d349209 100644
--- a/list.c
+++ b/list.c
@@ -35,14 +35,14 @@ 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 +69,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 +131,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 {
@@ -283,8 +283,12 @@ void
 highlight_line(WINDOW *win, int line)
 {
 	wstandout(win);
-	
-#ifdef mvwchgat
+
+	/*
+	 * this is a tricky one
+	 */
+#if 0
+/*#ifdef mvwchgat*/
 	mvwchgat(win, line, 0, -1,  A_STANDOUT, 0, NULL);
 #else
 	/*