diff src/protocols/irc/cmds.c @ 10246:a66cf83552dc

[gaim-migrate @ 11386] I changed gaim_find_conversation and gaim_find_conversation_with_account The first parameter is now one of GAIM_CONV_IM, GAIM_CONV_CHAT or GAIM_CONV_ANY. Unfortunately, this changes a bajillion files. Please look over this and make sure I use the correct type everywhere. Especially in Novell and MSN, and somewhat in SILC. committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Tue, 23 Nov 2004 06:14:15 +0000
parents cbdce0acbbe6
children cdeb727d1de3
line wrap: on
line diff
--- a/src/protocols/irc/cmds.c	Tue Nov 23 05:53:59 2004 +0000
+++ b/src/protocols/irc/cmds.c	Tue Nov 23 06:14:15 2004 +0000
@@ -34,7 +34,7 @@
 
 int irc_cmd_default(struct irc_conn *irc, const char *cmd, const char *target, const char **args)
 {
-	GaimConversation *convo = gaim_find_conversation_with_account(target, irc->account);
+	GaimConversation *convo = gaim_find_conversation_with_account(GAIM_CONV_ANY, target, irc->account);
 	char *buf;
 
 	if (!convo)
@@ -110,7 +110,7 @@
 	g_free(newargs[1]);
 	g_free(newargs);
 
-	convo = gaim_find_conversation_with_account(target, irc->account);
+	convo = gaim_find_conversation_with_account(GAIM_CONV_ANY, target, irc->account);
 	if (convo) {
 		action = g_strdup_printf("/me %s", args[0]);
 		if (action[strlen(action) - 1] == '\n')
@@ -167,8 +167,8 @@
 	if (!args || !args[0])
 		return 0;
 
-	convo = gaim_find_conversation_with_account(target, irc->account);
-	if (!convo || gaim_conversation_get_type(convo) != GAIM_CONV_CHAT)
+	convo = gaim_find_conversation_with_account(GAIM_CONV_CHAT, target, irc->account);
+	if (!convo)
 		return 0;
 
 	if (args[1])
@@ -436,8 +436,8 @@
 	if (!args)
 		return 0;
 
-	convo = gaim_find_conversation_with_account(target, irc->account);
-	if (!convo || gaim_conversation_get_type(convo) != GAIM_CONV_CHAT)
+	convo = gaim_find_conversation_with_account(GAIM_CONV_CHAT, target, irc->account);
+	if (!convo)
 		return 0;
 
 	if (!args[0]) {