diff src/conversation.c @ 7261:1930e3d00ecd

[gaim-migrate @ 7838] prpl-specific normalize is back, after my crusade to kill it. committer: Tailor Script <[e-mail]>

--- a/src/conversation.c	Tue Oct 14 04:44:43 2003 +0000
+++ b/src/conversation.c	Tue Oct 14 05:07:39 2003 +0000
@@ -1293,6 +1293,8 @@
 	return chats;
 }
 
+
+/* This is deprecated, right? */
 GaimConversation *
 gaim_find_conversation(const char *name)
 {
@@ -1302,12 +1304,12 @@
 
 	g_return_val_if_fail(name != NULL, NULL);
 
-	cuser = g_strdup(gaim_normalize(name));
+	cuser = g_strdup(gaim_normalize(NULL, name));
 
 	for (cnv = gaim_get_conversations(); cnv != NULL; cnv = cnv->next) {
 		c = (GaimConversation *)cnv->data;
 
-		if (!gaim_utf8_strcasecmp(cuser, gaim_normalize(gaim_conversation_get_name(c))))
+		if (!gaim_utf8_strcasecmp(cuser, gaim_normalize(NULL, gaim_conversation_get_name(c))))
 			break;
 
 		c = NULL;
@@ -1328,13 +1330,13 @@
 
 	g_return_val_if_fail(name != NULL, NULL);
 
-	cuser = g_strdup(gaim_normalize(name));
+	cuser = g_strdup(gaim_normalize(account, name));
 
 	for (cnv = gaim_get_conversations(); cnv != NULL; cnv = cnv->next) {
 		c = (GaimConversation *)cnv->data;
 
 		if (!gaim_utf8_strcasecmp(cuser,
-								  gaim_normalize(gaim_conversation_get_name(c))) &&
+								  gaim_normalize(account, gaim_conversation_get_name(c))) &&
 			account == gaim_conversation_get_account(c)) {
 
 			break;
@@ -1839,11 +1841,11 @@
 		char *str;
 		const char *disp;
 
-		str = g_strdup(gaim_normalize(who));
+		str = g_strdup(gaim_normalize(account, who));
 		disp = gaim_connection_get_display_name(gc);
 
-		if (!gaim_utf8_strcasecmp(str, gaim_normalize(gaim_account_get_username(account))) ||
-			(disp && !gaim_utf8_strcasecmp(str, gaim_normalize(disp)))) {
+		if (!gaim_utf8_strcasecmp(str, gaim_normalize(account, gaim_account_get_username(account))) ||
+			(disp && !gaim_utf8_strcasecmp(str, gaim_normalize(account, disp)))) {
 
 			flags |= GAIM_MESSAGE_SEND;
 		}