aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Trowbridge <trow@ximian.com>2001-07-02 12:32:58 +0800
committerJon Trowbridge <trow@src.gnome.org>2001-07-02 12:32:58 +0800
commite6191dc02e287a768ac8574499673d157397d079 (patch)
treee1116903b5d21212799a0f703dec1b18c01680ca
parent00e3b9af8a4c5d661b1cd1cecc6811cbf374f3dd (diff)
downloadgsoc2013-evolution-e6191dc02e287a768ac8574499673d157397d079.tar
gsoc2013-evolution-e6191dc02e287a768ac8574499673d157397d079.tar.gz
gsoc2013-evolution-e6191dc02e287a768ac8574499673d157397d079.tar.bz2
gsoc2013-evolution-e6191dc02e287a768ac8574499673d157397d079.tar.lz
gsoc2013-evolution-e6191dc02e287a768ac8574499673d157397d079.tar.xz
gsoc2013-evolution-e6191dc02e287a768ac8574499673d157397d079.tar.zst
gsoc2013-evolution-e6191dc02e287a768ac8574499673d157397d079.zip
Fall back to use the name field if all else fails (which can happen with
2001-07-01 Jon Trowbridge <trow@ximian.com> * 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
-rw-r--r--addressbook/ChangeLog4
-rw-r--r--addressbook/backend/ebook/e-destination.c6
2 files changed, 10 insertions, 0 deletions
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 <trow@ximian.com>
+ * 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;
+
}
}