X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=database.c;h=f1ebdf7d47f368bbe1b0282b7c04c90bd12a1a0f;hb=6f50296ed88b670fbc50b5c951dd14fa36b65088;hp=973c0a5a0c3928c17b45e900aaf731ef5b2baf05;hpb=e2826ae894d12e69674d1b624e87c05e6bbb2afd;p=pkg%2Fabook.git

diff --git a/database.c b/database.c
index 973c0a5..f1ebdf7 100644
--- a/database.c
+++ b/database.c
@@ -58,6 +58,7 @@ struct abook_field abook_fields[ITEM_FIELDS] = {
 	{"Name",	"name",		TAB_CONTACT},/* NAME */
 	{"E-mails",	"email",	TAB_CONTACT},/* EMAIL */
 	{"Address",	"address",	TAB_ADDRESS},/* ADDRESS */
+	{"Address2",	"address2",	TAB_ADDRESS},/* ADDRESS2 */   
 	{"City",	"city",		TAB_ADDRESS},/* CITY */
 	{"State/Province","state",	TAB_ADDRESS},/* STATE */
 	{"ZIP/Postal Code","zip",	TAB_ADDRESS},/* ZIP */
@@ -350,8 +351,8 @@ surnamecmp(const void *i1, const void *i2)
 	s1 = get_surname(a[NAME]);
 	s2 = get_surname(b[NAME]);
 
-	if( !(ret = safe_strcmp(s1, s2)) )
-		ret = safe_strcmp(a[NAME], b[NAME]);
+	if( !(ret = safe_strcoll(s1, s2)) )
+		ret = safe_strcoll(a[NAME], b[NAME]);
 
 	free(s1);
 	free(s2);
@@ -367,7 +368,7 @@ namecmp(const void *i1, const void *i2)
 	itemcpy(a, i1);
 	itemcpy(b, i2);
 	
-	return safe_strcmp( a[NAME], b[NAME] );
+	return safe_strcoll( a[NAME], b[NAME] );
 }
 
 void