From: wwp <wwp@free.fr>
Date: Thu, 30 Jul 2015 22:17:10 +0000 (+0200)
Subject: Better fix for 3.12.0-35, thanks to Michael Rasmussen.
X-Git-Tag: 3.13.0~83
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=5eeace716afe80dd2445a0f4e6b2e9f0d7ab1e5f;hp=cf35c411534a9b0b27040777628cd78a8aa1dd93

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

diff --git a/src/addr_compl.c b/src/addr_compl.c
index b3398f669..975db5090 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);
 	}
 }