From 96e5dc161fc6bb7ac376988c570d393a1d294e9d Mon Sep 17 00:00:00 2001 From: "simon.zheng" Date: Mon, 9 Apr 2007 02:35:11 +0000 Subject: ** Fix for bug #426829. 2007-04-09 simon.zheng ** Fix for bug #426829. * gui/contact-editor/eab-editor.c: (eab_editor_confirm_delete): * gui/widgets/eab-contact-display.c: (render_contact): To avoid printing a NULL char point, add statements to check the return result of et_email_location() and e_contact_get(). svn path=/trunk/; revision=33398 --- addressbook/gui/widgets/eab-contact-display.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'addressbook/gui/widgets/eab-contact-display.c') diff --git a/addressbook/gui/widgets/eab-contact-display.c b/addressbook/gui/widgets/eab-contact-display.c index ddade470a2..311af261be 100644 --- a/addressbook/gui/widgets/eab-contact-display.c +++ b/addressbook/gui/widgets/eab-contact-display.c @@ -513,7 +513,8 @@ render_contact (GtkHTMLStream *html_stream, EContact *contact) for (l = email_list, al=email_attr_list; l && al; l = l->next, al = al->next) { #ifdef HANDLE_MAILTO_INTERNALLY char *html = e_text_to_html (l->data, 0); - g_string_append_printf (accum, "%s%s (%s)", nl, email_num, html, get_email_location ((EVCardAttribute *) al->data)); + char *attr_str = get_email_location ((EVCardAttribute *) al->data); + g_string_append_printf (accum, "%s%s (%s)", nl, email_num, html, attr_str?attr_str:""); email_num ++; g_free (html); nl = "
"; -- cgit v1.2.3