aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/backend/ebook/e-card-simple.c
diff options
context:
space:
mode:
authorChristopher James Lahey <clahey@helixcode.com>2000-10-19 03:38:52 +0800
committerChris Lahey <clahey@src.gnome.org>2000-10-19 03:38:52 +0800
commit8fefb8df4b9f1901537ab31cefc3e44e86f4d099 (patch)
tree271a38cef9dda302534353ed77be3c680ded88d2 /addressbook/backend/ebook/e-card-simple.c
parentc03848ecdf2e370aaed618044f042d93fcda5f5c (diff)
downloadgsoc2013-evolution-8fefb8df4b9f1901537ab31cefc3e44e86f4d099.tar
gsoc2013-evolution-8fefb8df4b9f1901537ab31cefc3e44e86f4d099.tar.gz
gsoc2013-evolution-8fefb8df4b9f1901537ab31cefc3e44e86f4d099.tar.bz2
gsoc2013-evolution-8fefb8df4b9f1901537ab31cefc3e44e86f4d099.tar.lz
gsoc2013-evolution-8fefb8df4b9f1901537ab31cefc3e44e86f4d099.tar.xz
gsoc2013-evolution-8fefb8df4b9f1901537ab31cefc3e44e86f4d099.tar.zst
gsoc2013-evolution-8fefb8df4b9f1901537ab31cefc3e44e86f4d099.zip
Change NAME_OR_ORG to return the email address if both name and
2000-10-18 Christopher James Lahey <clahey@helixcode.com> * backend/ebook/e-card-simple.c: Change NAME_OR_ORG to return the email address if both name and organization are taken. * gui/component/select-names/e-select-names.c: Fixed up the spec strings in this class. Removed the "cursor_mode" argument to ETable since it's part of the spec now. svn path=/trunk/; revision=6003
Diffstat (limited to 'addressbook/backend/ebook/e-card-simple.c')
-rw-r--r--addressbook/backend/ebook/e-card-simple.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/addressbook/backend/ebook/e-card-simple.c b/addressbook/backend/ebook/e-card-simple.c
index 7cb644a802..ff65ff82b0 100644
--- a/addressbook/backend/ebook/e-card-simple.c
+++ b/addressbook/backend/ebook/e-card-simple.c
@@ -767,6 +767,10 @@ char *e_card_simple_get (ECardSimple *simple,
gtk_object_get(GTK_OBJECT(simple->card),
"org", &string,
NULL);
+ if (string && *string)
+ return g_strdup(string);
+ string = e_card_simple_get_email(simple,
+ E_CARD_SIMPLE_EMAIL_ID_EMAIL);
return g_strdup(string);
case E_CARD_SIMPLE_FIELD_FAMILY_NAME:
gtk_object_get (GTK_OBJECT(simple->card),