2006-04-06 [colin] 2.1.0cvs5

	* src/addressbook.c
		Fix crash with empty columns

diff --git a/ChangeLog b/ChangeLog
index eb7ab230d9dffcb3e905a7783453e1f57e18ae56..cfac1eddad7d758f9ba034d634b64441c3a080a5 100644 (file)
--- 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 bfb61d40cd9a9a8fc67edc522c4320336eab62c6..0f0bdb70da5315cf999f7079178487522a681853 100644 (file)
--- 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 0439ec9bdc449a55f659d8730bcd10a315fddaac..c97a7fa7e51d7b0d21308ea839a11b18db91852a 100644 (file)
--- 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 d59cfef456f12fc454db85816f0159d62290e6e4..42a58f35ca620bf897c60bb697c4d8ac6c1fa61a 100644 (file)
--- 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,