From 47db07dee8c848e2fb56766e812753f74a5c0926 Mon Sep 17 00:00:00 2001 From: Matt Bissiri Date: Tue, 26 Sep 2000 20:31:38 +0000 Subject: Make sure that card->name and card->full_name are always valid. Tue Sep 26 16:28:47 2000 Christopher James Lahey * backend/ebook/e-card.c: Make sure that card->name and card->full_name are always valid. * contact-editor/e-contact-editor.c: Removed some unused variables. 2000-09-22 Matt Bissiri * contact-editor/e-contact-editor-fullname.c (extract_info): If (editor->name == NULL), store ptr to newly allocated ECardName in editor->name, not just in a stack variable. This fixes a crash which happened when you click "New", then click "Full Name...", then enter name, then click "OK". * backend/ebook/e-card.c (e_card_name_to_string): Add g_return_val_if_fail. svn path=/trunk/; revision=5596 --- addressbook/gui/contact-editor/e-contact-editor-fullname.c | 5 ++++- addressbook/gui/contact-editor/e-contact-editor.c | 2 -- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'addressbook/gui/contact-editor') diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.c b/addressbook/gui/contact-editor/e-contact-editor-fullname.c index 79f458aa22..05e8d45702 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-fullname.c +++ b/addressbook/gui/contact-editor/e-contact-editor-fullname.c @@ -205,8 +205,11 @@ static void extract_info(EContactEditorFullname *editor) { ECardName *name = editor->name; - if (!name) + if (!name) { name = e_card_name_new(); + editor->name = name; + } + name->prefix = extract_field(editor, "entry-title" ); name->given = extract_field(editor, "entry-first" ); name->additional = extract_field(editor, "entry-middle"); diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index 42782fc549..b41a5e3ae7 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -738,8 +738,6 @@ BonoboUIVerb verbs [] = { static void create_ui (EContactEditor *ce) { - char *fname; - BonoboUINode *ui; BonoboUIComponent *component; Bonobo_UIContainer container; -- cgit v1.2.3