From e6191dc02e287a768ac8574499673d157397d079 Mon Sep 17 00:00:00 2001 From: Jon Trowbridge Date: Mon, 2 Jul 2001 04:32:58 +0000 Subject: Fall back to use the name field if all else fails (which can happen with 2001-07-01 Jon Trowbridge * backend/ebook/e-destination.c (e_destination_get_string): Fall back to use the name field if all else fails (which can happen with imported EDestinations). svn path=/trunk/; revision=10665 --- addressbook/ChangeLog | 4 ++++ addressbook/backend/ebook/e-destination.c | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index de74fffbb0..6a10b7a275 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,5 +1,9 @@ 2001-07-01 Jon Trowbridge + * backend/ebook/e-destination.c (e_destination_get_string): Fall + back to use the name field if all else fails (which can happen + with imported EDestinations). + * backend/ebook/e-destination.c (e_destination_is_empty): Fix for the "recipient not specified" bug --- we were not correctly checking for whether or not an EDestination was actually empty. diff --git a/addressbook/backend/ebook/e-destination.c b/addressbook/backend/ebook/e-destination.c index 882453be0e..172afb6da6 100644 --- a/addressbook/backend/ebook/e-destination.c +++ b/addressbook/backend/ebook/e-destination.c @@ -342,6 +342,12 @@ e_destination_get_string (const EDestination *dest) if (priv->string == NULL) priv->string = g_strdup (_("???")); + + } else { /* If there is no card... */ + + if (priv->name) + return priv->name; + } } -- cgit v1.2.3