commit 4f21ed7d70e42148a9cb125a4d09f39be8c7fbf1
parent 9e7a7b39b87d4b85c6fd2d614607410ae47812c1
Author: Paul Mangan <paul@claws-mail.org>
Date: Thu, 20 Oct 2011 18:19:47 +0000
2011-10-20 [paul] 3.7.10cvs39
* AUTHORS
* src/ldif.c
* src/gtk/authors.h
fix bug 2479, 'LDIF address book import matches tags case sensitive'
Patch by Bodo Graumann <mail@bodograumann.de>
Diffstat:
6 files changed, 25 insertions(+), 15 deletions(-)
diff --git a/AUTHORS b/AUTHORS
@@ -286,3 +286,4 @@ contributors (in addition to the above; based on Changelog)
Mikhail Efremov
Steve Rader
Hanno Meyer-Thurow
+ Bodo Graumann
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,11 @@
+2011-10-20 [paul] 3.7.10cvs39
+
+ * AUTHORS
+ * src/ldif.c
+ * src/gtk/authors.h
+ fix bug 2479, 'LDIF address book import matches tags case sensitive'
+ Patch by Bodo Graumann <mail@bodograumann.de>
+
2011-10-20 [mones] 3.7.10cvs38
* po/fr.po
diff --git a/PATCHSETS b/PATCHSETS
@@ -4242,3 +4242,4 @@
( cvs diff -u -r 1.1.4.19 -r 1.1.4.20 src/gtk/gtkshruler.c; ) > 3.7.10cvs36.patchset
( cvs diff -u -r 1.1.2.44 -r 1.1.2.45 src/prefs_msg_colors.c; ) > 3.7.10cvs37.patchset
( cvs diff -u -r 1.42.2.55 -r 1.42.2.56 po/fr.po; cvs diff -u -r 1.9.2.51 -r 1.9.2.52 src/common/defs.h; ) > 3.7.10cvs38.patchset
+( cvs diff -u -r 1.100.2.80 -r 1.100.2.81 AUTHORS; cvs diff -u -r 1.12.2.23 -r 1.12.2.24 src/ldif.c; cvs diff -u -r 1.1.2.74 -r 1.1.2.75 src/gtk/authors.h; ) > 3.7.10cvs39.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
MICRO_VERSION=10
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=38
+EXTRA_VERSION=39
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
diff --git a/src/gtk/authors.h b/src/gtk/authors.h
@@ -130,6 +130,7 @@ static char *CONTRIBS_LIST[] = {
"Marius Glauser",
"Thierry Godefroy",
"Alex Gorbachenko",
+"Bodo Graumann",
"Yang Guilong",
"Daniel Gustafson",
"HIROSHIMA",
diff --git a/src/ldif.c b/src/ldif.c
@@ -526,8 +526,7 @@ static void ldif_add_value(
{
gchar *nm, *val;
- nm = g_strdup( tagName );
- g_utf8_strdown( nm, -1 );
+ nm = g_utf8_strdown( tagName, -1 );
if( tagValue ) {
val = g_strdup( tagValue );
}
@@ -536,19 +535,19 @@ static void ldif_add_value(
}
g_strstrip( val );
- if( g_utf8_collate( nm, LDIF_TAG_COMMONNAME ) == 0 ) {
+ if( g_utf8_collate( nm, g_utf8_strdown( LDIF_TAG_COMMONNAME, -1 ) ) == 0 ) {
rec->listCName = g_slist_append( rec->listCName, val );
}
- else if( g_utf8_collate( nm, LDIF_TAG_FIRSTNAME ) == 0 ) {
+ else if( g_utf8_collate( nm, g_utf8_strdown( LDIF_TAG_FIRSTNAME, -1 ) ) == 0 ) {
rec->listFName = g_slist_append( rec->listFName, val );
}
- else if( g_utf8_collate( nm, LDIF_TAG_LASTNAME ) == 0 ) {
+ else if( g_utf8_collate( nm, g_utf8_strdown( LDIF_TAG_LASTNAME, -1 ) ) == 0 ) {
rec->listLName = g_slist_append( rec->listLName, val );
}
- else if( g_utf8_collate( nm, LDIF_TAG_NICKNAME ) == 0 ) {
+ else if( g_utf8_collate( nm, g_utf8_strdown( LDIF_TAG_NICKNAME, -1 ) ) == 0 ) {
rec->listNName = g_slist_append( rec->listNName, val );
}
- else if( g_utf8_collate( nm, LDIF_TAG_EMAIL ) == 0 ) {
+ else if( g_utf8_collate( nm, g_utf8_strdown( LDIF_TAG_EMAIL, -1 ) ) == 0 ) {
rec->listAddress = g_slist_append( rec->listAddress, val );
}
else {
@@ -756,30 +755,30 @@ static void ldif_hash_add_list( GHashTable *table, GSList *list ) {
gchar *tag = node->data;
if( ! g_hash_table_lookup( table, tag ) ) {
Ldif_FieldRec *rec = NULL;
- gchar *key = g_strdup( tag );
+ gchar *key = g_utf8_strdown( tag, -1 );
rec = ldif_create_fieldrec( tag );
- if( g_utf8_collate( tag, LDIF_TAG_DN ) == 0 ) {
+ if( g_utf8_collate( key, LDIF_TAG_DN ) == 0 ) {
rec->reserved = rec->selected = TRUE;
rec->userName = g_strdup( "dn" );
}
- else if( g_utf8_collate( tag, LDIF_TAG_COMMONNAME ) == 0 ) {
+ else if( g_utf8_collate( key, g_utf8_strdown( LDIF_TAG_COMMONNAME, -1 ) ) == 0 ) {
rec->reserved = rec->selected = TRUE;
rec->userName = g_strdup( _( "Display Name" ) );
}
- else if( g_utf8_collate( tag, LDIF_TAG_FIRSTNAME ) == 0 ) {
+ else if( g_utf8_collate( key, g_utf8_strdown( LDIF_TAG_FIRSTNAME, -1 ) ) == 0 ) {
rec->reserved = rec->selected = TRUE;
rec->userName = g_strdup( _( "First Name" ) );
}
- else if( g_utf8_collate( tag, LDIF_TAG_LASTNAME ) == 0 ) {
+ else if( g_utf8_collate( key, g_utf8_strdown( LDIF_TAG_LASTNAME, -1 ) ) == 0 ) {
rec->reserved = rec->selected = TRUE;
rec->userName = g_strdup( _( "Last Name" ) );
}
- else if( g_utf8_collate( tag, LDIF_TAG_NICKNAME ) == 0 ) {
+ else if( g_utf8_collate( key, g_utf8_strdown( LDIF_TAG_NICKNAME, -1 ) ) == 0 ) {
rec->reserved = rec->selected = TRUE;
rec->userName = g_strdup( _( "Nick Name" ) );
}
- else if( g_utf8_collate( tag, LDIF_TAG_EMAIL ) == 0 ) {
+ else if( g_utf8_collate( key, g_utf8_strdown( LDIF_TAG_EMAIL, -1 ) ) == 0 ) {
rec->reserved = rec->selected = TRUE;
rec->userName = g_strdup( _( "Email Address" ) );
}
