[Commits] [SCM] claws branch, master, updated. 3.12.0-36-g5eeace7

[wwp at claws-mail.org]

The branch, master has been updated
       via  5eeace716afe80dd2445a0f4e6b2e9f0d7ab1e5f (commit)
      from  cf35c411534a9b0b27040777628cd78a8aa1dd93 (commit)

Summary of changes:
 src/addr_compl.c |   10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)


- Log -----------------------------------------------------------------
commit 5eeace716afe80dd2445a0f4e6b2e9f0d7ab1e5f
Author: wwp <wwp at free.fr>
Date:   Fri Jul 31 00:17:10 2015 +0200

    Better fix for 3.12.0-35, thanks to Michael Rasmussen.

diff --git a/src/addr_compl.c b/src/addr_compl.c
index b3398f6..975db50 100644
--- a/src/addr_compl.c
+++ b/src/addr_compl.c
@@ -230,15 +230,7 @@ static gint addr_comparison_func(gconstpointer a, gconstpointer b)
 	else if (a_weight > b_weight)
 		return 1;
 	else {
-	    cmp = strcmp(a_ref->name, b_ref->name);
-		if (cmp)
-		    return cmp;
-		else {
-			if (a_ref->address && b_ref->address)
-				return strcmp(a_ref->address, b_ref->address);
-			else
-				return -1;
-		}
+		return cmp ? cmp : g_strcmp0(a_ref->address, b_ref->address);
 	}
 }
 

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail