Mercurial > pidgin

diff src/protocols/zephyr/zephyr.c @ 10246:a66cf83552dc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[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 9f358a718f38
children cfd119bd3caf
line wrap: on
line diff
--- a/src/protocols/zephyr/zephyr.c	Tue Nov 23 05:53:59 2004 +0000
+++ b/src/protocols/zephyr/zephyr.c	Tue Nov 23 06:14:15 2004 +0000
@@ -852,7 +852,8 @@
 
 			serv_got_chat_in(gc, zt2->id, send_inst_utf8, 0, buf3, time(NULL));
 			g_free(send_inst);
-			gconv1 = gaim_find_conversation_with_account(zt2->name, gc->account);
+			gconv1 = gaim_find_conversation_with_account(GAIM_CONV_CHAT,
+														 zt2->name, gc->account);
 			gcc = gaim_conversation_get_chat_data(gconv1);
 
 			if (!gaim_conv_chat_find_user(gcc, sendertmp)) {
@@ -1956,7 +1957,8 @@
 
 	sig = zephyr_get_signature();
 
-	gconv1 = gaim_find_conversation_with_account(zt->name, gc->account);
+	gconv1 = gaim_find_conversation_with_account(GAIM_CONV_CHAT, zt->name,
+												 gc->account);
 	gcc = gaim_conversation_get_chat_data(gconv1);
 
 	if (!(inst = (char *)gaim_conv_chat_get_topic(gcc)))
@@ -2434,7 +2436,8 @@
 	/* find_sub_by_id can return NULL */
 	if (!zt) 
 		return;
-	gconv = gaim_find_conversation_with_account(zt->name, gc->account);
+	gconv = gaim_find_conversation_with_account(GAIM_CONV_CHAT, zt->name,
+												gc->account);
 	gcc = gaim_conversation_get_chat_data(gconv);
 
 	topic_utf8 = zephyr_recv_convert(gc,(gchar *)topic,strlen(topic));