comparison src/gtkblist.c @ 13612:dd03aa8a28ad

[gaim-migrate @ 15998] 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. committer: Tailor Script <[e-mail]>

13611:7f91efd5af77

 */
static gboolean
_search_func(GtkTreeModel *model, gint column, const gchar *key, GtkTreeIter *iter, gpointer search_data)
{
	gchar *enteredstring;
	gchar *withmarkup;
	gchar *nomarkup;
	gchar *normalized;
	gboolean result;
	size_t i;

	PangoLogAttr *log_attrs;
	gchar *word;

	gtk_tree_model_get(model, iter, column, &withmarkup, -1);

	enteredstring = g_utf8_casefold(gaim_normalize(NULL, key), -1);
	nomarkup = gaim_markup_strip_html(withmarkup);
	normalized = g_utf8_casefold(gaim_normalize(NULL, nomarkup), -1);

	if (gaim_str_has_prefix(normalized, enteredstring))
	{
		g_free(withmarkup);
		g_free(enteredstring);
		g_free(nomarkup);
		g_free(normalized);
		return FALSE;
	}

	}
#endif

	g_free(withmarkup);
	g_free(enteredstring);
	g_free(nomarkup);
	g_free(normalized);

	return result;
}

13612:dd03aa8a28ad

 */
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;
	gboolean result;
	size_t i;

	PangoLogAttr *log_attrs;
	gchar *word;

	gtk_tree_model_get(model, iter, column, &withmarkup, -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);
	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(normalized);
		return FALSE;
	}

	}
#endif

	g_free(withmarkup);
	g_free(enteredstring);
	g_free(normalized);

	return result;
}