From 8fefb8df4b9f1901537ab31cefc3e44e86f4d099 Mon Sep 17 00:00:00 2001 From: Christopher James Lahey Date: Wed, 18 Oct 2000 19:38:52 +0000 Subject: Change NAME_OR_ORG to return the email address if both name and 2000-10-18 Christopher James Lahey * 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 --- addressbook/backend/ebook/e-card-simple.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'addressbook/backend/ebook') 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), -- cgit v1.2.3