talons

commit 7fca97dcd169e49e0b6f9530153714c290c90119
parent cb87edf1710e8021ed0affc2157cf0c340660c72
Author: Ricardo Mones <ricardo@mones.org>
Date:   Mon, 22 Jun 2015 22:56:44 +0200

Fix bug #3438 ‘Filter to add address to Addressbook duplicates address in Name field’

Also included some cleanup:
  • Remove unused function strlen_with_check
  • Remove unused macro STRLEN_WITH_CHECK
  • Update copyright header

Diffstat:
M
src/filtering.c
 | 
26
+++++++-------------------

1 file changed, 7 insertions(+), 19 deletions(-)
diff --git a/src/filtering.c b/src/filtering.c
@@ -1,6 +1,6 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2012 Hiroyuki Yamamoto & The Claws Mail Team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2015 Hiroyuki Yamamoto & The Claws Mail Team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,7 +14,6 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * 
  */
 
 #include "defs.h"
@@ -57,19 +56,6 @@ gboolean debug_filtering_session = FALSE;
 
 static gboolean filtering_is_final_action(FilteringAction *filtering_action);
 
-#define STRLEN_WITH_CHECK(expr) \
-        strlen_with_check(#expr, __LINE__, expr)
-	        
-static inline gint strlen_with_check(const gchar *expr, gint fline, const gchar *str)
-{
-        if (str) 
-		return strlen(str);
-	else {
-	        debug_print("%s(%d) - invalid string %s\n", __FILE__, fline, expr?expr:"(null)");
-	        return 0;
-	}
-}
-
 FilteringAction * filteringaction_new(int type, int account_id,
 				      gchar * destination,
 				      gint labelcolor, gint score, gchar * header)
@@ -530,16 +516,18 @@ static gboolean filteringaction_apply(FilteringAction * action, MsgInfo * info)
 					extract_address(stripped_addr);
 
 					if (complete_matches_found(walk->data) == 0) {
+						gchar *name = procheader_get_fromname(walk->data);
 						debug_print("adding address '%s' to addressbook '%s'\n",
 								stripped_addr, action->destination);
 #ifndef USE_NEW_ADDRBOOK
-						if (!addrbook_add_contact(abf, folder, stripped_addr, stripped_addr, NULL)) {
+						if (!addrbook_add_contact(abf, folder, name, stripped_addr, NULL)) {
 #else
-						if (!addressadd_selection(NULL, stripped_addr, NULL, NULL)) {
+						if (!addressadd_selection(name, stripped_addr, NULL, NULL)) {
 #endif
-							g_warning("contact could not been added\n");
+							g_warning("contact could not be added\n");
 							errors++;
 						}
+						g_free(name);
 					} else {
 						debug_print("address '%s' already found in addressbook '%s', skipping\n",
 								stripped_addr, action->destination);