Mercurial > pidgin.yaz

diff src/gtkconv.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 9aa0b6d11bbf
children 3016b1b32339
line wrap: on
line diff
--- a/src/gtkconv.c	Tue Nov 23 05:53:59 2004 +0000
+++ b/src/gtkconv.c	Tue Nov 23 06:14:15 2004 +0000
@@ -1276,7 +1276,7 @@
 	if(!real_who)
 		return;
 
-	conv2 = gaim_find_conversation_with_account(real_who, account);
+	conv2 = gaim_find_conversation_with_account(GAIM_CONV_IM, real_who, account);
 
 	if (conv2 != NULL)
 		gaim_conv_window_show(gaim_conversation_get_window(conv2));
@@ -4317,7 +4317,7 @@
 		 * just move the conv to this window.  Otherwise, create a new
 		 * conv and add it to this window.
 		 */
-		c = gaim_find_conversation(b->name);
+		c = gaim_find_conversation(GAIM_CONV_IM, b->name);
 		if (c != NULL) {
 			GaimConvWindow *oldwin;
 			oldwin = gaim_conversation_get_window(c);