From: Colin Leroy Date: Thu, 6 Apr 2006 05:38:40 +0000 (+0000) Subject: 2006-04-06 [colin] 2.1.0cvs5 X-Git-Tag: rel_2_2_0~100 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=a1589d85b5a0629006ef0ae028e1c35468aabb8f;hp=8a943122b3338609c8f2b69236153c2e1f61b215 2006-04-06 [colin] 2.1.0cvs5 * src/addressbook.c Fix crash with empty columns --- diff --git a/ChangeLog b/ChangeLog index eb7ab230d..cfac1edda 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-04-06 [colin] 2.1.0cvs5 + + * src/addressbook.c + Fix crash with empty columns + 2006-04-05 [colin] 2.1.0cvs4 * src/wizard.c diff --git a/PATCHSETS b/PATCHSETS index bfb61d40c..0f0bdb70d 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -1376,3 +1376,4 @@ ( cvs diff -u -r 1.60.2.56 -r 1.60.2.57 src/addressbook.c; cvs diff -u -r 1.1.2.22 -r 1.1.2.23 src/prefs_summaries.c; ) > 2.1.0cvs2.patchset ( cvs diff -u -r 1.96.2.105 -r 1.96.2.106 src/textview.c; cvs diff -u -r 1.83.2.65 -r 1.83.2.66 src/mimeview.c; cvs diff -u -r 1.20.2.8 -r 1.20.2.9 src/mimeview.h; ) > 2.1.0cvs3.patchset ( cvs diff -u -r 1.1.2.28 -r 1.1.2.29 src/wizard.c; cvs diff -u -r 1.10.2.17 -r 1.10.2.18 src/prefs_gtk.c; ) > 2.1.0cvs4.patchset +( cvs diff -u -r 1.60.2.57 -r 1.60.2.58 src/addressbook.c; ) > 2.1.0cvs5.patchset diff --git a/configure.ac b/configure.ac index 0439ec9bd..c97a7fa7e 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=1 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=4 +EXTRA_VERSION=5 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/addressbook.c b/src/addressbook.c index d59cfef45..42a58f35c 100644 --- a/src/addressbook.c +++ b/src/addressbook.c @@ -2936,7 +2936,7 @@ static void addressbook_folder_load_one_person( if( person == NULL ) return; - text[COL_NAME] = NULL; + text[COL_NAME] = ""; node = person->listEMail; while( node ) { ItemEMail *email = node->data; @@ -2983,8 +2983,8 @@ static void addressbook_folder_load_one_person( if( ! haveAddr ) { /* Have name without EMail */ text[COL_NAME] = ADDRITEM_NAME(person); - text[COL_ADDRESS] = NULL; - text[COL_REMARKS] = NULL; + text[COL_ADDRESS] = ""; + text[COL_REMARKS] = ""; nodePerson = gtk_sctree_insert_node( clist, NULL, NULL, text, FOLDER_SPACING, @@ -3071,8 +3071,8 @@ static void addressbook_folder_load_group( GtkCTree *clist, ItemFolder *itemFold ItemGroup *group = items->data; if( group == NULL ) continue; text[COL_NAME] = ADDRITEM_NAME(group); - text[COL_ADDRESS] = NULL; - text[COL_REMARKS] = NULL; + text[COL_ADDRESS] = ""; + text[COL_REMARKS] = ""; nodeGroup = gtk_sctree_insert_node(clist, NULL, NULL, text, FOLDER_SPACING, atci->iconXpm, atci->maskXpm,