From d6e6a8d2cc1dcd1ec1aab907a3f7723e0a675b71 Mon Sep 17 00:00:00 2001 From: Christopher James Lahey Date: Wed, 28 Mar 2001 23:49:48 +0000 Subject: Fixed some crashes. 2001-03-28 Christopher James Lahey * backend/ebook/e-card.c (e_card_set_arg): Fixed some crashes. svn path=/trunk/; revision=9001 --- addressbook/ChangeLog | 4 ++++ addressbook/backend/ebook/e-card.c | 14 ++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 047a0f85bd..11edeb99c2 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,7 @@ +2001-03-28 Christopher James Lahey + + * backend/ebook/e-card.c (e_card_set_arg): Fixed some crashes. + 2001-03-28 Christopher James Lahey * gui/component/select-names/e-select-names-table-model.c diff --git a/addressbook/backend/ebook/e-card.c b/addressbook/backend/ebook/e-card.c index 8c1f7b1905..8729652c6d 100644 --- a/addressbook/backend/ebook/e-card.c +++ b/addressbook/backend/ebook/e-card.c @@ -204,6 +204,12 @@ e_card_new (char *vcard) cleanVObject(vobj); vobj = next; } + if (card->name == NULL) + card->name = e_card_name_new(); + if (card->file_as == NULL) + card->file_as = g_strdup(""); + if (card->fname == NULL) + card->fname = g_strdup(""); return card; } @@ -265,6 +271,8 @@ char if ( card->fname ) addPropValue(vobj, VCFullNameProp, card->fname); + else if (card->fname) + addProp(vobj, VCFullNameProp); if ( card->name && (card->name->prefix || card->name->given || card->name->additional || card->name->family || card->name->suffix) ) { VObject *nameprop; @@ -280,6 +288,8 @@ char if ( card->name->suffix ) addPropValue(nameprop, VCNameSuffixesProp, card->name->suffix); } + else if (card->name) + addProp(vobj, VCNameProp); if ( card->address ) { @@ -1638,12 +1648,16 @@ e_card_set_arg (GtkObject *object, GtkArg *arg, guint arg_id) case ARG_FILE_AS: g_free(card->file_as); card->file_as = g_strdup(GTK_VALUE_STRING(*arg)); + if (card->file_as == NULL) + card->file_as = g_strdup(""); break; case ARG_FULL_NAME: g_free(card->fname); card->fname = g_strdup(GTK_VALUE_STRING(*arg)); if (card->name) e_card_name_free (card->name); + if (card->fname == NULL) + card->fname = g_strdup(""); card->name = e_card_name_from_string (card->fname); break; case ARG_NAME: -- cgit v1.2.3