From 424506262d215dfe306aea0d0fe86833d08b82a4 Mon Sep 17 00:00:00 2001 From: Jon Trowbridge Date: Thu, 29 Mar 2001 23:46:55 +0000 Subject: Added #include 2001-03-29 Jon Trowbridge * printing/e-contact-print.c: Added #include * printing/e-contact-print-envelope.c: Added #include and #include * gui/component/select-names/e-select-names-completion.c (match_email): Better handle matching of "nameless" contacts. * backend/ebook/e-destination.c (e_destination_get_string): Better handle the case of a "nameless" contact. 2001-03-29 Jon Trowbridge * camel-filter-driver.c (camel_filter_driver_filter_message): Save the source URL using camel_mime_message_set_source. * camel-mime-message.c (camel_mime_message_set_source): Renamed camel_mime_message_set_identity to this. Sets the X-Evolution-Source header. (camel_mime_message_get_source): Returns the X-Evolution-Source header. 2001-03-29 Jon Trowbridge * mail-callbacks.c: Added #include to get things to compile. * mail-callbacks.c (mail_generate_reply): Look at the X-Evolution-Source header, and try to find a corresponding account. If this works, send the mail from this account. If not, use the default account. * mail-ops.c (send_queue_send): Strip out the X-Evolution-Source header before sending. * mail-config.c (mail_config_get_account_by_source_url): Added. Look up accounts by source URL. svn path=/trunk/; revision=9032 --- addressbook/backend/ebook/e-destination.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'addressbook/backend/ebook') diff --git a/addressbook/backend/ebook/e-destination.c b/addressbook/backend/ebook/e-destination.c index c652564442..3b7ad60189 100644 --- a/addressbook/backend/ebook/e-destination.c +++ b/addressbook/backend/ebook/e-destination.c @@ -206,7 +206,19 @@ e_destination_get_string (const EDestination *dest) if (priv->card) { priv->string = e_card_name_to_string (priv->card->name); + if (priv->string) { + g_strstrip (priv->string); + if (*(priv->string) == '\0') { + g_free (priv->string); + priv->string = NULL; + } + } + + if (priv->string == NULL) + priv->string = g_strdup (e_destination_get_email (dest)); + if (priv->string == NULL) + priv->string = g_strdup (_("???")); } } -- cgit v1.2.3