talons

commit 3ae69ab83422842dc88bfe83ced7b9e78369499f
parent dbcb8365e502850b0c7e06d2b912f800a356bcce
Author: Tristan Chabredier <wwp@claws-mail.org>
Date:   Sun, 31 Aug 2008 07:24:02 +0000

2008-08-31 [wwp]	3.5.0cvs86

	* src/addressbook.c
		Don't break nickname edition for non-LDAP books (nickname
		value was overwritten when editing existing contact, this
		came from 3.0.2cvs109).

Diffstat:
M
ChangeLog
 | 
7
+++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/addressbook.c
 | 
8
++++++--

4 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+2008-08-31 [wwp]	3.5.0cvs86
+
+	* src/addressbook.c
+		Don't break nickname edition for non-LDAP books (nickname
+		value was overwritten when editing existing contact, this
+		came from 3.0.2cvs109).
+
 2008-08-30 [colin]	3.5.0cvs85
 
 	* src/mainwindow.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3497,3 +3497,4 @@
 ( cvs diff -u -r 1.395.2.384 -r 1.395.2.385 src/summaryview.c;  ) > 3.5.0cvs83.patchset
 ( cvs diff -u -r 1.395.2.385 -r 1.395.2.386 src/summaryview.c;  ) > 3.5.0cvs84.patchset
 ( cvs diff -u -r 1.274.2.270 -r 1.274.2.271 src/mainwindow.c;  cvs diff -u -r 1.395.2.386 -r 1.395.2.387 src/summaryview.c;  ) > 3.5.0cvs85.patchset
+( cvs diff -u -r 1.60.2.123 -r 1.60.2.124 src/addressbook.c;  ) > 3.5.0cvs86.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=85
+EXTRA_VERSION=86
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/addressbook.c b/src/addressbook.c
@@ -3383,8 +3383,12 @@ static void addressbook_edit_address_post_cb( ItemPerson *person )
 {
 	if( person ) {
 #ifdef USE_LDAP
-		if (strcmp2(person->nickName, ADDRITEM_NAME(person)))
-			addritem_person_set_nick_name( person, ADDRITEM_NAME(person));
+		AddressBookFile *abf = addressbook_get_book_file();
+
+		if (abf && abf->type == ADDR_IF_LDAP) {
+			if (strcmp2(person->nickName, ADDRITEM_NAME(person)))
+				addritem_person_set_nick_name( person, ADDRITEM_NAME(person));
+		}
 #endif
 		addressbook_folder_refresh_one_person( GTK_CMCTREE(addrbook.clist), person );
 		invalidate_address_completion();