From: Colin Leroy <colin@colino.net>
Date: Sun, 7 Aug 2005 13:02:28 +0000 (+0000)
Subject: 2005-08-07 [colin]	1.9.13cvs22
X-Git-Tag: rel_1_9_14~65
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=4bf469b4ee49cfe01d0de7ec819d9add09d2eae0

2005-08-07 [colin]	1.9.13cvs22

	* src/addressbook.c
		Fix bug #771 (Dragged contacts not saved)
---

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 120d85e5a..b1f7a8a9b 100644
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2005-08-07 [colin]	1.9.13cvs22
+
+	* src/addressbook.c
+		Fix bug #771 (Dragged contacts not saved)
+
 2005-08-07 [paul]	1.9.13cvs21
 
 	* src/summaryview.c
diff --git a/PATCHSETS b/PATCHSETS
index 144e3a9e4..9e54ac379 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -707,3 +707,4 @@
 ( cvs diff -u -r 1.274.2.51 -r 1.274.2.52 src/mainwindow.c;  ) > 1.9.13cvs19.patchset
 ( cvs diff -u -r 1.207.2.52 -r 1.207.2.53 src/folderview.c;  cvs diff -u -r 1.395.2.103 -r 1.395.2.104 src/summaryview.c;  ) > 1.9.13cvs20.patchset
 ( cvs diff -u -r 1.395.2.104 -r 1.395.2.105 src/summaryview.c;  ) > 1.9.13cvs21.patchset
+( cvs diff -u -r 1.60.2.23 -r 1.60.2.24 src/addressbook.c;  ) > 1.9.13cvs22.patchset
diff --git a/configure.ac b/configure.ac
index cde5e006a..7aa192d78 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=13
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=21
+EXTRA_VERSION=22
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/addressbook.c b/src/addressbook.c
index ee8687e8e..3f2c8aefd 100644
--- a/src/addressbook.c
+++ b/src/addressbook.c
@@ -4759,7 +4759,6 @@ static void addressbook_drag_received_cb(GtkWidget        *widget,
 			    ds->type == ADDR_IF_LDAP) 
 			    	goto free_list;		
 			afolder = addrindex_ds_get_root_folder( ds );
-			
 		} else {
 			goto free_list;
 		}
@@ -4770,9 +4769,16 @@ static void addressbook_drag_received_cb(GtkWidget        *widget,
 			AddressBookFile *obook = dragged_ab;
 			AddressBookFile *abook = addressbook_get_book_file_for_node(node);
 			for (cur = dragged_persons; cur; cur = cur->next) {
+				AddrBookBase *adbase = ( AddrBookBase * ) ds ? ds->rawDataSource : NULL;
+				AddressCache *cache = (adbase) ? adbase->addressCache : NULL;
+
 				person = (ItemPerson *)cur->data;
 				addritem_folder_remove_person(ofolder, person);
-				addritem_folder_add_person(afolder, person);
+				if (cache) {
+					addrcache_folder_add_person(cache, afolder, person);
+				} else {
+					addritem_folder_add_person(afolder, person);
+				}
 			}
 			addressbook_list_select_clear();
 			gtk_ctree_select( GTK_CTREE(addrbook.ctree), addrbook.opened);