2007-11-02 [colin] 3.0.2cvs111
authorColin Leroy <colin@colino.net>
Fri, 2 Nov 2007 07:07:56 +0000 (07:07 +0000)
committerColin Leroy <colin@colino.net>
Fri, 2 Nov 2007 07:07:56 +0000 (07:07 +0000)
* src/addressbook.c
Maybe fix bug 1376, 'crash on
addressbook manipulation'

ChangeLog
PATCHSETS
configure.ac
src/addressbook.c

index 27b92d9..40783c0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-02 [colin]     3.0.2cvs111
+
+       * src/addressbook.c
+               Maybe fix bug 1376, 'crash on 
+               addressbook manipulation'
+
 2007-10-31 [paul]      3.0.2cvs110
 
        * src/ldapupdate.c
index 313f909..337344b 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.24.2.23 -r 1.24.2.24 Makefile.am;  ) > 3.0.2cvs108.patchset
 ( cvs diff -u -r 1.654.2.3078 -r 1.654.2.3079 configure.ac;  ) > 3.0.2cvs109.patchset
 ( cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/ldapupdate.c;  ) > 3.0.2cvs110.patchset
+( cvs diff -u -r 1.60.2.103 -r 1.60.2.104 src/addressbook.c;  ) > 3.0.2cvs111.patchset
index d9f4fb5..9df8c37 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=110
+EXTRA_VERSION=111
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 3c59959..07275e1 100644 (file)
@@ -1452,6 +1452,8 @@ static void addressbook_del_clicked(GtkButton *button, gpointer data)
                        item = node->data;
                        node = g_list_next( node );
                        aio = ( AddrItemObject * ) item->addressItem;
+                       if (!aio)
+                               continue;
                        if( aio->type == ADDR_ITEM_GROUP ) {
                                ItemGroup *item = ( ItemGroup * ) aio;
                                GtkCTreeNode *nd = NULL;