diff src/protocols/silc/silc.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 ecf3ce2e2ab1
children 681c69bfc267
line wrap: on
line diff
--- a/src/protocols/silc/silc.c	Tue Nov 23 05:53:59 2004 +0000
+++ b/src/protocols/silc/silc.c	Tue Nov 23 06:14:15 2004 +0000
@@ -842,7 +842,8 @@
 	char tmp[256], *nickname = NULL;
 	SilcClientEntry client_entry;
 
-	convo = gaim_find_conversation_with_account(im->nick, sg->account);
+	convo = gaim_find_conversation_with_account(GAIM_CONV_IM, im->nick,
+							sg->account);
 	if (!convo)
 		return;
 
@@ -979,15 +980,11 @@
 		return GAIM_CMD_RET_FAILED;
 
 	if(args && args[0]) {
-		convo = gaim_find_conversation_with_account(args[0], gc->account);
+		convo = gaim_find_conversation_with_account(GAIM_CONV_CHAT, args[0],
+									gc->account);
 	} else
 		convo = conv;
 
-	if (gaim_conversation_get_type(convo) != GAIM_CONV_CHAT) {
-		*error = g_strdup(_("Failed to leave channel"));
-		return GAIM_CMD_RET_FAILED;
-	}
-
 	id = gaim_conv_chat_get_id(GAIM_CONV_CHAT(convo));
 
 	if (id == 0)