2007-05-31 [colin] 2.9.2cvs24

[claws.git] / src / addressbook.c

diff --git a/src/addressbook.c b/src/addressbook.c
index d42f49af97c3206ef50fc268459c8159954d7c1c..b563ae2d4a917380a4199dc668f5db6477e2ca29 100644 (file)
--- a/src/addressbook.c
+++ b/src/addressbook.c
@@ -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 {