Mercurial > pidgin

diff src/gtkblist.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 95ca0db2d01d
children d24de0d2aabd
line wrap: on
line diff
--- a/src/gtkblist.c	Tue Nov 23 05:53:59 2004 +0000
+++ b/src/gtkblist.c	Tue Nov 23 06:14:15 2004 +0000
@@ -3883,8 +3883,6 @@
 		if (*whoalias == '\0')
 			whoalias = NULL;
 
-		c = gaim_find_conversation_with_account(who, data->account);
-
 		if ((g = gaim_find_group(grp)) == NULL)
 		{
 			g = gaim_group_new(grp);
@@ -3908,6 +3906,7 @@
 		 * and gaim_blist_add_buddy().  Or something.  --Mark
 		 */
 
+		c = gaim_find_conversation_with_account(GAIM_CONV_IM, who, data->account);
 		if (c != NULL) {
 			gaim_buddy_icon_update(gaim_conv_im_get_icon(GAIM_CONV_IM(c)));
 			gaim_conversation_update(c, GAIM_CONV_UPDATE_ADD);
@@ -4094,9 +4093,11 @@
 		if (GAIM_PLUGIN_PROTOCOL_INFO(data->account->gc->prpl)->get_chat_name != NULL)
 			chat_name = GAIM_PLUGIN_PROTOCOL_INFO(
 							data->account->gc->prpl)->get_chat_name(chat->components);
-		
+
 		if (chat_name != NULL) {
-			conv = gaim_find_conversation_with_account(chat_name, data->account);
+			conv = gaim_find_conversation_with_account(GAIM_CONV_CHAT,
+													   chat_name,
+													   data->account);
 			g_free(chat_name);
 		}