[kazehakase-svn] [3437] Drop converting passed string to utf-8

Zurück zum Archiv-Index

svnno****@sourc***** svnno****@sourc*****
Wed Mar 5 07:20:58 JST 2008


Revision: 3437
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=kazehakase&view=rev&rev=3437
Author:   pal_gene
Date:     2008-03-05 07:20:57 +0900 (Wed, 05 Mar 2008)

Log Message:
-----------
Drop converting passed string to utf-8
GTK is already internally used utf-8.

Modified Paths:
--------------
    kazehakase/trunk/module/search/kz-hyper-estraier-search.c

Modified: kazehakase/trunk/module/search/kz-hyper-estraier-search.c
===================================================================
--- kazehakase/trunk/module/search/kz-hyper-estraier-search.c	2008-03-04 22:20:54 UTC (rev 3436)
+++ kazehakase/trunk/module/search/kz-hyper-estraier-search.c	2008-03-04 22:20:57 UTC (rev 3437)
@@ -293,10 +293,8 @@
 		g_string_append(phrase, tmp);
 		g_free(tmp);
 	}
-	utf8 = g_locale_to_utf8(phrase->str, -1, NULL, NULL, NULL);
+	tmp = g_utf8_normalize(phrase->str,-1, G_NORMALIZE_ALL_COMPOSE);
 	g_string_free(phrase, TRUE);
-	tmp = g_utf8_normalize(utf8, -1, G_NORMALIZE_ALL_COMPOSE);
-	g_free(utf8);
 	utf8 = g_utf8_strdown(tmp, -1);
 	g_free(tmp);
 	
@@ -641,7 +639,7 @@
 		} else {
 		    g_warning("register error: %s", est_err_msg(est_mtdb_error(he_search->db)));
 		    g_warning("drop %s,%s\n", ESTDATTRURI, est_doc_attr(doc, ESTDATTRURI));
-		} 
+		}
 	}
 
 	est_doc_delete(doc);




More information about the Kazehakase-cvs mailing list
Zurück zum Archiv-Index