From: Ed Catmur <ed@catmur.co.uk>
Date: Sat, 27 Jan 2007 17:29:46 +0000 (+0000)
Subject: Normalize text to fix ligatures problem. See bug #341947 for details.
X-Git-Tag: EVINCE_0_7_2~67
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=9de1152cd935d9f00f2709052d25d42b18cb1b0f;p=evince.git

Normalize text to fix ligatures problem. See bug #341947 for details.

2007-01-27  Ed Catmur  <ed@catmur.co.uk>

	* shell/ev-view.c: (get_selected_text):

	Normalize text to fix ligatures problem. See bug
	#341947 for details.


svn path=/trunk/; revision=2254
---

diff --git a/ChangeLog b/ChangeLog
index f93dded2..dc58733a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-01-27  Ed Catmur  <ed@catmur.co.uk>
+
+	* shell/ev-view.c: (get_selected_text):
+	
+	Normalize text to fix ligatures problem. See bug
+	#341947 for details.
+
 2007-01-25  Carlos Garcia Campos  <carlosgc@gnome.org>
 
 	* shell/ev-page-cache.c: (ev_page_cache_finalize):
diff --git a/shell/ev-view.c b/shell/ev-view.c
index 47038645..fec6435a 100644
--- a/shell/ev-view.c
+++ b/shell/ev-view.c
@@ -4642,6 +4642,7 @@ get_selected_text (EvView *ev_view)
 {
 	GString *text;
 	GList *l;
+	gchar *normalized_text;
 
 	text = g_string_new (NULL);
 
@@ -4660,7 +4661,9 @@ get_selected_text (EvView *ev_view)
 
 	ev_document_doc_mutex_unlock ();
 
-	return g_string_free (text, FALSE);
+	normalized_text = g_utf8_normalize (text->str, text->len, G_NORMALIZE_NFKC);
+	g_string_free (text, TRUE);
+	return normalized_text;
 }
 
 void