From: Kaj-Michael Lang <milang@tal.org>
Date: Sat, 3 Nov 2007 13:51:15 +0000 (+0200)
Subject: Use G_NORMALIZE_ALL_COMPOSE
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b8485cbf098b0d266321c48988dd90b8117590fb;p=mapper

Use G_NORMALIZE_ALL_COMPOSE
---

diff --git a/src/osm.c b/src/osm.c
index dc0321a..6a93b4f 100644
--- 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);