2006-08-24 [colin] 2.4.0cvs85

	* src/addressbook.c
		Fix strange list selection
		Fix random seg (Invalid read of freed memory)

diff --git a/ChangeLog b/ChangeLog
index 164ab9c5ee0c3f3847e13f3b11d45ec531dace77..5c70ff50a196d936d8f459bd6fee901e401411db 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-24 [colin]     2.4.0cvs85
+
+       * src/addressbook.c
+               Fix strange list selection
+               Fix random seg (Invalid read of freed memory)
+
 2006-08-24 [colin]     2.4.0cvs84
 
        * src/alertpanel.c

diff --git a/PATCHSETS b/PATCHSETS
index 326bb30d93f69279a917f4421e9388b98859ec6a..6ca02fccc6f5373e94971bd840abeb2e3be9e055 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1776,3 +1776,4 @@
 ( diff -u /dev/null manual/es/.cvsignore;  diff -u /dev/null manual/es/dist/.cvsignore;  diff -u /dev/null manual/es/dist/html/.cvsignore;  diff -u /dev/null manual/es/dist/pdf/.cvsignore;  diff -u /dev/null manual/es/dist/ps/.cvsignore;  diff -u /dev/null manual/es/dist/txt/.cvsignore;  ) > 2.4.0cvs82.patchset
 ( cvs diff -u -r 1.8.2.17 -r 1.8.2.18 src/headerview.c;  cvs diff -u -r 1.274.2.139 -r 1.274.2.140 src/mainwindow.c;  cvs diff -u -r 1.94.2.98 -r 1.94.2.99 src/messageview.c;  cvs diff -u -r 1.16.2.35 -r 1.16.2.36 src/msgcache.c;  cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/partial_download.c;  cvs diff -u -r 1.47.2.32 -r 1.47.2.33 src/procheader.c;  cvs diff -u -r 1.150.2.74 -r 1.150.2.75 src/procmsg.c;  cvs diff -u -r 1.60.2.31 -r 1.60.2.32 src/procmsg.h;  cvs diff -u -r 1.96.2.140 -r 1.96.2.141 src/textview.c;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/common/timing.h;  ) > 2.4.0cvs83.patchset
 ( cvs diff -u -r 1.17.2.25 -r 1.17.2.26 src/alertpanel.c;  cvs diff -u -r 1.2.2.18 -r 1.2.2.19 src/gtk/inputdialog.c;  cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/plugins/pgpcore/passphrase.c;  ) > 2.4.0cvs84.patchset
+( cvs diff -u -r 1.60.2.62 -r 1.60.2.63 src/addressbook.c;  ) > 2.4.0cvs85.patchset

diff --git a/configure.ac b/configure.ac
index c053b6763ad272b9da4a0634f46fe3bdf6a6f9c1..11451dd97483ffc7873c46c30ba0f112ad07322b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=84
+EXTRA_VERSION=85
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/addressbook.c b/src/addressbook.c
index 57e9d1ce66598360a636ff0196005fbc55100deb..9ed355baa1343542af2d576cb64b6a15d2fde574 100644 (file)
--- a/src/addressbook.c
+++ b/src/addressbook.c
@@ -1342,6 +1342,7 @@ static void addressbook_del_clicked(GtkButton *button, gpointer data)
                                ItemPerson *person = ( ItemPerson * ) ADDRITEM_PARENT(item);
                                item = addrbook_person_remove_email( abf, person, item );
                                if( item ) {
+                                       addrcache_remove_email(abf->addressCache, item);
                                        addritem_free_item_email( item );
                                }
                                addressbook_folder_refresh_one_person( clist, person );
@@ -3278,7 +3279,8 @@ static void addressbook_set_clist( AddressObject *obj, gboolean refresh ) {
                        addressbook_folder_load_group( ctreelist, itemFolder );
                }
        }
-       gtk_sctree_sort_node(GTK_CTREE(clist), NULL);
+       gtk_sctree_sort_recursive(GTK_CTREE(clist), NULL);
+       clist->focus_row = -1;
        gtk_clist_thaw(clist);
 }