X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=edit.c;h=352ae49bd5630ec1c414ea0b048e0aa0cca0d5dd;hb=7d53083353eb69d7c7c7c8ffc3fdeb4e9ff4551e;hp=643603245b7958cb0198ae44d3ced8e72e949778;hpb=7c5cfcacf9b413a8b9c41dfd8a41f0c643fbee18;p=pkg%2Fabook.git

diff --git a/edit.c b/edit.c
index 6436032..352ae49 100644
--- a/edit.c
+++ b/edit.c
@@ -130,7 +130,7 @@ print_editor_header(int item)
 	if( *database[item][EMAIL] )
 		snprintf(header, EDITW_COLS, "%s <%s>",
 				database[item][NAME],
-				database[item][EMAIL]);
+				email);
 	else
 		snprintf(header, EDITW_COLS, "%s", database[item][NAME]);
 
@@ -146,8 +146,9 @@ static void
 editor_print_data(int tab, int item)
 {
 	const int pos_x = EDITW_COLS > 70 ? 8:4;
-	const int start_y = 4;
+	const int start_y = 5;
 	int i, j;
+	int y, x;
 
 	for(i = 0, j = 1; i < ITEM_FIELDS; i++) {
 		if(abook_fields[i].tab != tab)
@@ -157,18 +158,26 @@ editor_print_data(int tab, int item)
 			int k;
 			char emails[MAX_EMAILS][MAX_EMAIL_LEN];
 			split_emailstr(item, emails);
-			mvwaddstr(editw, 6, pos_x, "E-mail addresses:");
-			for(k=0; k < MAX_EMAILS; k++)
-				mvwprintw(editw, 7 + k, pos_x,
+			getyx(editw, y, x);
+			mvwaddstr(editw, y+1, pos_x, "E-mail addresses:");
+			for(k = 0; k < MAX_EMAILS; k++) {
+				getyx(editw, y, x);
+				mvwprintw(editw, y+1, pos_x,
 				"%c -\t\t%s", '2' + k, emails[k] );
+			}
 			continue;
 		}
 				
-		mvwprintw(editw, start_y + j, pos_x, "%d - %s",
+		if(j > 1) {
+			getyx(editw, y, x); y++;
+		} else
+			y = start_y;
+
+		mvwprintw(editw, y, pos_x, "%d - %s",
 				j,
 				abook_fields[i].name);
-		mvwaddch(editw, start_y + j, 28, ':');
-		mvwaddstr(editw, start_y + j, 30, safe_str(database[item][i]));
+		mvwaddch(editw, y, 28, ':');
+		mvwaddstr(editw, y, 30, safe_str(database[item][i]));
 
 		j++;
 	}