From 5eeace716afe80dd2445a0f4e6b2e9f0d7ab1e5f Mon Sep 17 00:00:00 2001 From: wwp Date: Fri, 31 Jul 2015 00:17:10 +0200 Subject: [PATCH 1/1] Better fix for 3.12.0-35, thanks to Michael Rasmussen. --- src/addr_compl.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) 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); } } -- 2.25.1