2007-04-20 [wwp] 2.9.1cvs11

	* src/addressbook.c
		Fix the use of display name in name column,
		it has been overriden w/ the use of nickname
		by 2.9.0cvs3. Now nickname is used (if any)
		in case of LDAP books only.

diff --git a/ChangeLog b/ChangeLog
index 5968484da288f2f0f42669a42a640ae36e3f4723..5d0a05d1f1678bf53b37e3af1e1120ea86c8c422 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-04-20 [wwp]       2.9.1cvs11
+
+       * src/addressbook.c
+               Fix the use of display name in name column,
+               it has been overriden w/ the use of nickname
+               by 2.9.0cvs3. Now nickname is used (if any)
+               in case of LDAP books only.
+

 2007-04-20 [colin]     2.9.1cvs10
 
        * src/mimeview.c
 2007-04-20 [colin]     2.9.1cvs10
 
        * src/mimeview.c

diff --git a/PATCHSETS b/PATCHSETS
index a4b485bb30dafa7c3c699d4338871b3fcf1d6ed2..0858f5094bbc7980f0e8995bd4761384722c014c 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2538,3 +2538,4 @@
 ( cvs diff -u -r 1.207.2.160 -r 1.207.2.161 src/folderview.c;  cvs diff -u -r 1.274.2.184 -r 1.274.2.185 src/mainwindow.c;  ) > 2.9.1cvs8.patchset
 ( cvs diff -u -r 1.43.2.64 -r 1.43.2.65 src/toolbar.c;  ) > 2.9.1cvs9.patchset
 ( cvs diff -u -r 1.83.2.105 -r 1.83.2.106 src/mimeview.c;  cvs diff -u -r 1.395.2.297 -r 1.395.2.298 src/summaryview.c;  cvs diff -u -r 1.96.2.168 -r 1.96.2.169 src/textview.c;  ) > 2.9.1cvs10.patchset
 ( cvs diff -u -r 1.207.2.160 -r 1.207.2.161 src/folderview.c;  cvs diff -u -r 1.274.2.184 -r 1.274.2.185 src/mainwindow.c;  ) > 2.9.1cvs8.patchset
 ( cvs diff -u -r 1.43.2.64 -r 1.43.2.65 src/toolbar.c;  ) > 2.9.1cvs9.patchset
 ( cvs diff -u -r 1.83.2.105 -r 1.83.2.106 src/mimeview.c;  cvs diff -u -r 1.395.2.297 -r 1.395.2.298 src/summaryview.c;  cvs diff -u -r 1.96.2.168 -r 1.96.2.169 src/textview.c;  ) > 2.9.1cvs10.patchset

+( cvs diff -u -r 1.60.2.87 -r 1.60.2.88 src/addressbook.c;  ) > 2.9.1cvs11.patchset

diff --git a/configure.ac b/configure.ac
index 02e67889a5338771c662599f4463fe95cd4dc063..90c8c99c0394c293f380cd36ad0fa17ce0da01fe 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=10
+EXTRA_VERSION=11

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/addressbook.c b/src/addressbook.c
index 55290dbb7d5b831637d4490ef53fa12f93121196..d42f49af97c3206ef50fc268459c8159954d7c1c 100644 (file)
--- a/src/addressbook.c
+++ b/src/addressbook.c
@@ -3403,6 +3403,7 @@ static void addressbook_folder_load_one_person(
        gchar *text[N_LIST_COLS];
        gboolean flgFirst = TRUE, haveAddr = FALSE;
        GList *node;
        gchar *text[N_LIST_COLS];
        gboolean flgFirst = TRUE, haveAddr = FALSE;
        GList *node;

+       AddressBookFile *abf = addressbook_get_book_file();

 
        if( person == NULL ) return;
 
 
        if( person == NULL ) return;
 


@@ -3423,9 +3424,11 @@ static void addressbook_folder_load_one_person(
                        if( str ) {
                                text[COL_NAME] = str;
                        }
                        if( str ) {
                                text[COL_NAME] = str;
                        }

-                       else if( person->nickName ) {
+#ifdef USE_LDAP
+                       else if( abf->type == ADDR_IF_LDAP && person->nickName ) {

                                text[COL_NAME] = person->nickName;
                        }
                                text[COL_NAME] = person->nickName;
                        }

+#endif

                        else {
                                text[COL_NAME] = ADDRITEM_NAME(person);
                        }
                        else {
                                text[COL_NAME] = ADDRITEM_NAME(person);
                        }