[Commits] [SCM] claws branch, master, updated. 3.10.1-75-g4dbe7a8

[Colin]

The branch master of project "claws" (Claws Mail) has been updated
       via  4dbe7a8759f8928986bd00a0ea635c5c18954651 (commit)
       via  18b45d52267d0d418db258446fac2511088d9c5b (commit)
      from  080fca09c98913ffe750dd4741ca408a659a69a9 (commit)

Summary of changes:
 src/addr_compl.c   |   65 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/common/utils.h |    7 ++++++
 2 files changed, 72 insertions(+)


- Log -----------------------------------------------------------------
commit 4dbe7a8759f8928986bd00a0ea635c5c18954651
Author: Colin Leroy <colin at colino.net>
Date:   Tue Jun 17 20:21:49 2014 +0200

    Make sure we don't access out of bounds of the match string.

diff --git a/src/addr_compl.c b/src/addr_compl.c
index b35a8bd..21348ab 100644
--- a/src/addr_compl.c
+++ b/src/addr_compl.c
@@ -191,7 +191,7 @@ static gint weight_addr_match(const address_entry* addr)
 	if (match != NULL) {
 		if (match == addr->name)
 			n_weight = -4;
-		else if (*(match - 1) == ' ')
+		else if (match > addr->name && *(match - 1) == ' ')
 			n_weight = -3;
 		else
 			n_weight = match - addr->name;
@@ -205,7 +205,8 @@ static gint weight_addr_match(const address_entry* addr)
 			else
 				a_weight = match - addr->address;
 
-			if (*(match + strlen(g_completion_prefix)) == '@')
+			if (strlen(match) < strlen(g_completion_prefix)
+			 && *(match + strlen(g_completion_prefix)) == '@')
 				a_weight--;
 		}
 	}
@@ -213,7 +214,7 @@ static gint weight_addr_match(const address_entry* addr)
 	if (n_weight == -4 && a_weight < 0)
 		n_weight = -5;
 
-	return a_weight < n_weight ? a_weight : n_weight;
+	return MIN(a_weight, n_weight);
 }
 
 static gint addr_comparison_func(gconstpointer a, gconstpointer b)
diff --git a/src/common/utils.h b/src/common/utils.h
index d556b0e..2df4034 100644
--- a/src/common/utils.h
+++ b/src/common/utils.h
@@ -222,6 +222,13 @@ G_STMT_END
 	} 								\
 } G_STMT_END
 
+#ifndef MIN
+	#define MIN(a, b) ((a) < (b) ? (a) : (b))
+#endif
+#ifndef MAX
+	#define MAX(a, b) ((a) > (b) ? (a) : (b))
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif

commit 18b45d52267d0d418db258446fac2511088d9c5b
Author: Colin Leroy <colin at colino.net>
Date:   Tue Jun 17 20:07:28 2014 +0200

    Fix bug #3212, "Make wildcard address matching/autocomplete a bit smarter by sorting results in a more human way". Patch by Michael Gemlin.

diff --git a/src/addr_compl.c b/src/addr_compl.c
index adcb7cc..b35a8bd 100644
--- a/src/addr_compl.c
+++ b/src/addr_compl.c
@@ -174,6 +174,67 @@ static gint addr_completion_func(const gchar *needle, const gchar *haystack,
 }
 
 /**
+ * Function used by GTK to compare elements for sorting
+ * name match beginning > name match after space > email address
+ *   match beginning and full match before @ > email adress
+ *   match beginning. Otherwise match position in string.
+ * \param a first element in comparsion
+ * \param b second element in comparison
+ */
+static gint weight_addr_match(const address_entry* addr)
+{
+	gint	n_weight = strlen(addr->name);
+	gint	a_weight = addr->address ? strlen(addr->address) : n_weight;
+	gchar* 	match = NULL;
+
+	match = strcasestr(addr->name, g_completion_prefix);
+	if (match != NULL) {
+		if (match == addr->name)
+			n_weight = -4;
+		else if (*(match - 1) == ' ')
+			n_weight = -3;
+		else
+			n_weight = match - addr->name;
+	}
+
+	if (addr->address) {
+		match = strcasestr(addr->address, g_completion_prefix);
+		if (match != NULL) {
+			if (match == addr->address)
+				a_weight = -1;
+			else
+				a_weight = match - addr->address;
+
+			if (*(match + strlen(g_completion_prefix)) == '@')
+				a_weight--;
+		}
+	}
+
+	if (n_weight == -4 && a_weight < 0)
+		n_weight = -5;
+
+	return a_weight < n_weight ? a_weight : n_weight;
+}
+
+static gint addr_comparison_func(gconstpointer a, gconstpointer b)
+{
+	const address_entry*	a_ref = (const address_entry*)a;
+	const address_entry*	b_ref = (const address_entry*)b;
+	gint			a_weight = weight_addr_match(a_ref);
+	gint			b_weight = weight_addr_match(b_ref);
+	gint			cmp;
+
+	if (a_weight < b_weight)
+		return -1;
+	else if (a_weight > b_weight)
+		return 1;
+	else {
+	    cmp = strcmp(a_ref->name, b_ref->name);
+	    return cmp ? cmp :  strcmp(a_ref->address, b_ref->address);
+	}
+}
+
+/**
  * Initialize all completion index data.
  */
 static void init_all(void)
@@ -556,6 +617,9 @@ guint complete_address(const gchar *str)
 		}
 		count = cpl + 1;	/* index 0 is the original prefix */
 		g_completion_next = 1;	/* we start at the first completed one */
+		if (prefs_common.address_search_wildcard)
+		    g_completion_addresses = g_slist_sort(g_completion_addresses,
+							  addr_comparison_func);
 	} else {
 		g_free(g_completion_prefix);
 		g_completion_prefix = NULL;

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


hooks/post-receive
-- 
Claws Mail