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 f93dded20a5946595345c7e1f91489452c0b64f7..dc58733a86948adf67cbcca7d9511d201a1641e8 100644 (file)
--- 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 470386450ce582ba42ec34b2cc8dbb43dc6a7a9e..fec6435a532e2b5f356f2467b497163d599c7651 100644 (file)
--- 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