Use G_NORMALIZE_ALL_COMPOSE

diff --git a/src/osm.c b/src/osm.c
index dc0321a49dac1109f897b3ef32a1e6493c225f2a..6a93b4f76e8d30c4c0c71844ddd520f7b9f313dc 100644 (file)
--- a/src/osm.c
+++ b/src/osm.c
@@ -1442,7 +1442,7 @@ switch (t) {
                        cnode->data->name=NULL;
                        v=g_hash_table_lookup(osm_node_tags, "name");
                        if (v)
-                               cnode->data->name=g_strstrip(g_utf8_normalize(v, -1, G_NORMALIZE_ALL));
+                               cnode->data->name=g_strstrip(g_utf8_normalize(v, -1, G_NORMALIZE_ALL_COMPOSE));
                        v=g_hash_table_lookup(osm_node_tags, "note");
                        if (v)
                                cnode->data->desc=g_strstrip(g_strdup(v));
@@ -1519,7 +1519,7 @@ switch (t) {
 
                v=g_hash_table_lookup(osm_way_tags, "name");
                if (v) {
-                       cway->data->name=g_utf8_normalize(v, -1, G_NORMALIZE_ALL);
+                       cway->data->name=g_utf8_normalize(v, -1, G_NORMALIZE_ALL_COMPOSE);
                        /* Try to find other language names */
                        cway->data->names=g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
                        g_hash_table_foreach(osm_way_tags, find_nls_names, cway->data->names);