2005-08-07 [colin] 1.9.13cvs22
authorColin Leroy <colin@colino.net>
Sun, 7 Aug 2005 13:02:28 +0000 (13:02 +0000)
committerColin Leroy <colin@colino.net>
Sun, 7 Aug 2005 13:02:28 +0000 (13:02 +0000)
* src/addressbook.c
Fix bug #771 (Dragged contacts not saved)

ChangeLog-gtk2.claws
PATCHSETS
configure.ac
src/addressbook.c

index 120d85e5a21c95656abb03b8fb572e7c66c9c3b5..b1f7a8a9bdf9f66916181e532ab8c9569a2e92bd 100644 (file)
@@ -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
index 144e3a9e4b5b5c5635b3032b114aaa3833c7c07c..9e54ac3798bf1c655944d0dcdbe5fa15368a88fd 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( 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
index cde5e006ae15134b23e74b1a1c75fb164446d954..7aa192d7820f39d700cfd1b449f51cc9b9dc0301 100644 (file)
@@ -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=
 
index ee8687e8ec60d353fa594e411b817ab599ddb87e..3f2c8aefdcf26faf37b20983f338d96788b97d56 100644 (file)
@@ -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);