diff options
| author | Matt Bissiri <bissiri@eecs.umich.edu> | 2000-09-27 04:31:38 +0800 |
|---|---|---|
| committer | Chris Lahey <clahey@src.gnome.org> | 2000-09-27 04:31:38 +0800 |
| commit | 47db07dee8c848e2fb56766e812753f74a5c0926 (patch) | |
| tree | ce94b05b29c03b26a794e1f39b7768d37ec960f2 /addressbook/gui | |
| parent | a03e2e75297c4d1b99890cdc90c3443088eb7ce8 (diff) | |
| download | gsoc2013-evolution-47db07dee8c848e2fb56766e812753f74a5c0926.tar.gz gsoc2013-evolution-47db07dee8c848e2fb56766e812753f74a5c0926.tar.zst gsoc2013-evolution-47db07dee8c848e2fb56766e812753f74a5c0926.zip | |
Make sure that card->name and card->full_name are always valid.
Tue Sep 26 16:28:47 2000 Christopher James Lahey <clahey@helixcode.com>
* 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 <bissiri@eecs.umich.edu>
* 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
Diffstat (limited to 'addressbook/gui')
| -rw-r--r-- | addressbook/gui/contact-editor/e-contact-editor-fullname.c | 5 | ||||
| -rw-r--r-- | addressbook/gui/contact-editor/e-contact-editor.c | 2 |
2 files changed, 4 insertions, 3 deletions
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; |