[evolution] Bug 671546 - Search with 'contains' in composer auto-completion

[Milan Crha <mcrha src gnome org>]

commit 4e7333ba25013ade2737e598fd21a6845fb70360
Author: Milan Crha <mcrha redhat com>
Date:   Tue May 5 08:56:37 2015 +0200

    Bug 671546 - Search with 'contains' in composer auto-completion

 e-util/e-name-selector-dialog.c |   16 ++++++++++++++--
 e-util/e-name-selector-entry.c  |    3 +++
 2 files changed, 17 insertions(+), 2 deletions(-)
---
diff --git a/e-util/e-name-selector-dialog.c b/e-util/e-name-selector-dialog.c
index c900d21..4f2fe4f 100644
--- a/e-util/e-name-selector-dialog.c
+++ b/e-util/e-name-selector-dialog.c
@@ -1276,7 +1276,13 @@ search_changed (ENameSelectorDialog *name_selector_dialog)
                        "(or (beginswith \"file_as\" %s) "
                        "    (beginswith \"full_name\" %s) "
                        "    (beginswith \"email\" %s) "
-                       "    (beginswith \"nickname\" %s)%s))",
+                       "    (beginswith \"nickname\" %s)"
+                       "    (contains \"file_as\" %s) "
+                       "    (contains \"full_name\" %s) "
+                       "    (contains \"email\" %s) "
+                       "    (contains \"nickname\" %s)%s))",
+                       text_escaped, text_escaped,
+                       text_escaped, text_escaped,
                        text_escaped, text_escaped,
                        text_escaped, text_escaped,
                        user_fields_str ? user_fields_str : "");
@@ -1286,9 +1292,15 @@ search_changed (ENameSelectorDialog *name_selector_dialog)
                        "(or (beginswith \"file_as\" %s) "
                        "    (beginswith \"full_name\" %s) "
                        "    (beginswith \"email\" %s) "
-                       "    (beginswith \"nickname\" %s)%s))",
+                       "    (beginswith \"nickname\" %s)"
+                       "    (contains \"file_as\" %s) "
+                       "    (contains \"full_name\" %s) "
+                       "    (contains \"email\" %s) "
+                       "    (contains \"nickname\" %s)%s))",
                        category_escaped, text_escaped, text_escaped,
                        text_escaped, text_escaped,
+                       text_escaped, text_escaped,
+                       text_escaped, text_escaped,
                        user_fields_str ? user_fields_str : "");
 
        book_query = e_book_query_from_string (query_string);
diff --git a/e-util/e-name-selector-entry.c b/e-util/e-name-selector-entry.c
index a82b04f..3dcb938 100644
--- a/e-util/e-name-selector-entry.c
+++ b/e-util/e-name-selector-entry.c
@@ -852,11 +852,14 @@ set_completion_query (ENameSelectorEntry *name_selector_entry,
                "(or "
                " (beginswith \"nickname\"  %s) "
                " (beginswith \"email\"     %s) "
+               " (contains \"nickname\"  %s) "
+               " (contains \"email\"     %s) "
                " %s "
                " %s "
                " %s "
                ")",
                encoded_cue_str, encoded_cue_str,
+               encoded_cue_str, encoded_cue_str,
                full_name_query_str, file_as_query_str,
                user_fields_str ? user_fields_str : "");