From 9af35d848c6bd939c607c9c8293ad7e475ecaa0c Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Wed, 20 Dec 2006 08:17:46 +0000 Subject: [PATCH] * modest-text-utils.[ch]: - fixed modest_text_utils_remove_address (impl and doc) pmo-trunk-r568 --- src/modest-text-utils.c | 12 +++++++----- src/modest-text-utils.h | 10 ++++++---- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/modest-text-utils.c b/src/modest-text-utils.c index 4262066..5cf47bc 100644 --- a/src/modest-text-utils.c +++ b/src/modest-text-utils.c @@ -213,16 +213,18 @@ modest_text_utils_derived_subject (const gchar *subject, const gchar *prefix) } } -gchar * +gchar* modest_text_utils_remove_address (const gchar *address_list, const gchar *address) { - char *dup, *token, *ptr, *result; + gchar *dup, *token, *ptr, *result; GString *filtered_emails; - if (!address_list) - return NULL; + g_return_val_if_fail (address_list, NULL); - /* Search for substring */ + if (!address) + return g_strdup (address_list); + + /* search for substring */ if (!strstr ((const char *) address_list, (const char *) address)) return g_strdup (address_list); diff --git a/src/modest-text-utils.h b/src/modest-text-utils.h index e07e682..405a231 100644 --- a/src/modest-text-utils.h +++ b/src/modest-text-utils.h @@ -106,12 +106,14 @@ gchar* modest_text_utils_inline (const gchar *text, /** * modest_text_utils_remove_address - * @address_list: string with a comma-separated list of email addresses - * @address: an specific e-mail address + * @address_list: none-NULL string with a comma-separated list of email addresses + * @address: an specific e-mail address * - * remove a specific address from a list of email addresses + * remove a specific address from a list of email addresses; if @address + * is NULL, returns an unchanged @address_list * - * Returns: a newly allocated string containing the new list + * Returns: a newly allocated string containing the new list, or NULL + * in case of error or the original @address_list was NULL */ gchar* modest_text_utils_remove_address (const gchar *address_list, const gchar *address); -- 1.7.9.5