2007-05-31 [colin] 2.9.2cvs24
authorColin Leroy <colin@colino.net>
Thu, 31 May 2007 06:36:46 +0000 (06:36 +0000)
committerColin Leroy <colin@colino.net>
Thu, 31 May 2007 06:36:46 +0000 (06:36 +0000)
* src/addressbook.c
Fix missing display name when modifying
LDAP. Patch by Michael Rasmussen

ChangeLog
PATCHSETS
configure.ac
src/addressbook.c

index 7a03fc0e108ccb28269ba917032b60f7430afa39..cf2de00fa25603441e9a3c95c136db5f41735842 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-31 [colin]     2.9.2cvs24
+
+       * src/addressbook.c
+               Fix missing display name when modifying
+               LDAP. Patch by Michael Rasmussen
+
 2007-05-31 [wwp]       2.9.2cvs23
 
        * src/plugins/bogofilter/Makefile.am
index a7d1a3bc6befeb20f9995f20e1dbbd64d2970354..fd7bfe110a13283fcd08804d26c482d9d0402e90 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.47.2.41 -r 1.47.2.42 src/procheader.c;  ) > 2.9.2cvs21.patchset
 ( cvs diff -u -r 1.1.2.71 -r 1.1.2.72 src/gtk/quicksearch.c;  ) > 2.9.2cvs22.patchset
 ( cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/bogofilter/Makefile.am;  cvs diff -u -r 1.4.2.7 -r 1.4.2.8 src/plugins/clamav/Makefile.am;  cvs diff -u -r 1.3.2.3 -r 1.3.2.4 src/plugins/demo/Makefile.am;  cvs diff -u -r 1.4.2.5 -r 1.4.2.6 src/plugins/dillo_viewer/Makefile.am;  cvs diff -u -r 1.5.2.6 -r 1.5.2.7 src/plugins/spamassassin/Makefile.am;  ) > 2.9.2cvs23.patchset
+( cvs diff -u -r 1.60.2.88 -r 1.60.2.89 src/addressbook.c;  ) > 2.9.2cvs24.patchset
index 8348d05f149d60a9473dbacf913be8946c2264d7..c0911670fbe62dd7fb2feafdbd9bef107c963a3a 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=23
+EXTRA_VERSION=24
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index d42f49af97c3206ef50fc268459c8159954d7c1c..b563ae2d4a917380a4199dc668f5db6477e2ca29 100644 (file)
@@ -3426,7 +3426,14 @@ static void addressbook_folder_load_one_person(
                        }
 #ifdef USE_LDAP
                        else if( abf->type == ADDR_IF_LDAP && person->nickName ) {
-                               text[COL_NAME] = person->nickName;
+                               if (person->nickName) {
+                                       if (strcmp(person->nickName, "") != 0) {
+                                               text[COL_NAME] = person->nickName;
+                                       }
+                                       else {
+                                               text[COL_NAME] = ADDRITEM_NAME(person);
+                                       }
+                               }
                        }
 #endif
                        else {