[Gaim-commits] CVS: gaim/src gtkblist.c,1.429,1.430

[Richard L. <rl...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4944/src

Modified Files:
	gtkblist.c 
Log Message:
Use g_utf8_normalize() directly instead of calling gaim_normalize(). This makes it more clear what's happening, and also avoids a copy to a buffer.

Index: gtkblist.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkblist.c,v
retrieving revision 1.429
retrieving revision 1.430
diff -u -d -p -r1.429 -r1.430
--- gtkblist.c	24 Mar 2006 16:04:59 -0000	1.429
+++ gtkblist.c	10 Apr 2006 20:51:51 -0000	1.430
@@ -3393,6 +3393,7 @@ static gboolean
 _search_func(GtkTreeModel *model, gint column, const gchar *key, GtkTreeIter *iter, gpointer search_data)
 {
 	gchar *enteredstring;
+	gchar *tmp;
 	gchar *withmarkup;
 	gchar *nomarkup;
 	gchar *normalized;
@@ -3404,15 +3405,20 @@ _search_func(GtkTreeModel *model, gint c
 
 	gtk_tree_model_get(model, iter, column, &withmarkup, -1);
 
-	enteredstring = g_utf8_casefold(gaim_normalize(NULL, key), -1);
+	tmp = g_utf8_normalize(key, -1, G_NORMALIZE_DEFAULT);
+	enteredstring = g_utf8_casefold(tmp, -1);
+	g_free(tmp);
+
 	nomarkup = gaim_markup_strip_html(withmarkup);
-	normalized = g_utf8_casefold(gaim_normalize(NULL, nomarkup), -1);
+	tmp = g_utf8_normalize(nomarkup, -1, G_NORMALIZE_DEFAULT);
+	g_free(nomarkup);
+	normalized = g_utf8_casefold(tmp, -1);
+	g_free(tmp);
 
 	if (gaim_str_has_prefix(normalized, enteredstring))
 	{
 		g_free(withmarkup);
 		g_free(enteredstring);
-		g_free(nomarkup);
 		g_free(normalized);
 		return FALSE;
 	}
@@ -3461,7 +3467,6 @@ _search_func(GtkTreeModel *model, gint c
 
 	g_free(withmarkup);
 	g_free(enteredstring);
-	g_free(nomarkup);
 	g_free(normalized);
 
 	return result;