2008-08-16 [colin] 3.5.0cvs61

	* src/editaddress_other_attributes_ldap.h
		Add 'l' field (localityName)

diff --git a/ChangeLog b/ChangeLog
index ca8949b440e8c1979cf60638cd88bc9fd3bf2a1f..f21ef755ae4242c00d03178342b58b7fccb9e588 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-16 [colin]     3.5.0cvs61
+
+       * src/editaddress_other_attributes_ldap.h
+               Add 'l' field (localityName)
+
 2008-08-16 [colin]     3.5.0cvs60
 
        * src/mainwindow.c

diff --git a/PATCHSETS b/PATCHSETS
index f078e2c9cdfdc1dbafbea1dfb1616ff2fe056976..105364da427a5219485dbf946351b2451e79efac 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3472,3 +3472,4 @@
 ( cvs diff -u -r 1.94.2.183 -r 1.94.2.184 src/messageview.c;  cvs diff -u -r 1.19.2.20 -r 1.19.2.21 src/messageview.h;  cvs diff -u -r 1.83.2.142 -r 1.83.2.143 src/mimeview.c;  ) > 3.5.0cvs58.patchset
 ( cvs diff -u -r 1.213.2.184 -r 1.213.2.185 src/folder.c;  cvs diff -u -r 1.5.2.53 -r 1.5.2.54 src/gtk/pluginwindow.c;  ) > 3.5.0cvs59.patchset
 ( cvs diff -u -r 1.274.2.266 -r 1.274.2.267 src/mainwindow.c;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/gtk/gtkcmclist.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/gtk/gtkcmclist.h;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/gtk/gtkcmctree.c;  cvs diff -u -r 1.1.4.48 -r 1.1.4.49 src/gtk/gtksctree.c;  cvs diff -u -r 1.5.2.81 -r 1.5.2.82 src/gtk/gtkutils.c;  cvs diff -u -r 1.5.2.14 -r 1.5.2.15 src/gtk/gtkvscrollbutton.c;  ) > 3.5.0cvs60.patchset
+( cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/editaddress_other_attributes_ldap.h;  ) > 3.5.0cvs61.patchset

diff --git a/configure.ac b/configure.ac
index f9676a9afaf40265bf7ef121398aef6ac828c27c..5d886b18ed3dc0bfe31e9cfa7d11fbee9777edd8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=60
+EXTRA_VERSION=61
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/editaddress_other_attributes_ldap.h b/src/editaddress_other_attributes_ldap.h
index 26d3d2a0623324d68247cae292db066afeb3d09c..ed29b85efad85150410352bcb9cdc475e20d641d 100644 (file)
--- a/src/editaddress_other_attributes_ldap.h
+++ b/src/editaddress_other_attributes_ldap.h
@@ -92,6 +92,7 @@ static const char *ATTRIBUTE[] = {
        "postalCode",
        "postalAddress",
        "st", /* state or province */
+       "l", /* locality Name */
        "departmentNumber",
        "homePhone",
        "homePostalAddress",