[shotwell] Saved search supports diacritics: Closes bgo#719112

[Jim Nelson <jnelson src gnome org>]

commit f691aca08a53eddbbd5eeece7782d1a70da5348a
Author: Wolfgang Steitz <wolfer7 web de>
Date:   Tue Mar 4 13:45:00 2014 -0800

    Saved search supports diacritics: Closes bgo#719112

 src/Tag.vala                    |    2 +-
 src/searches/SearchBoolean.vala |    2 +-
 src/util/string.vala            |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/src/Tag.vala b/src/Tag.vala
index b503e24..1ae76ba 100644
--- a/src/Tag.vala
+++ b/src/Tag.vala
@@ -720,7 +720,7 @@ public class Tag : DataSource, ContainerSource, Proxyable, Indexable {
     }
 
     public string get_searchable_name() {
-        string istring = HierarchicalTagUtilities.get_basename(get_path()).down().normalize();
+        string istring = HierarchicalTagUtilities.get_basename(get_path()).down();
         return String.remove_diacritics(istring);
     }
     
diff --git a/src/searches/SearchBoolean.vala b/src/searches/SearchBoolean.vala
index 1cca836..431e398 100644
--- a/src/searches/SearchBoolean.vala
+++ b/src/searches/SearchBoolean.vala
@@ -265,7 +265,7 @@ public class SearchConditionText : SearchCondition {
     
     public SearchConditionText(SearchCondition.SearchType search_type, string? text, Context context) {
         this.search_type = search_type;
-        this.text = (text != null) ? text.down() : "";
+        this.text = (text != null) ? String.remove_diacritics(text.down()) : "";
         this.context = context;
     }
     
diff --git a/src/util/string.vala b/src/util/string.vala
index 8114afd..9fda007 100644
--- a/src/util/string.vala
+++ b/src/util/string.vala
@@ -185,7 +185,7 @@ public string remove_diacritics(string istring) {
     var builder = new StringBuilder ();
     unichar ch;
     int i = 0;
-    while(istring.get_next_char(ref i, out ch)) {
+    while(istring.normalize().get_next_char(ref i, out ch)) {
         switch(ch.type()) {
             case UnicodeType.CONTROL:
             case UnicodeType.FORMAT: