Mercurial > pidgin.yaz
diff src/gtkdialogs.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 | 224c9f244a3a |
children | 2a9ec10e0c4c |
line wrap: on
line diff
--- a/src/gtkdialogs.c Tue Nov 23 05:53:59 2004 +0000 +++ b/src/gtkdialogs.c Tue Nov 23 06:14:15 2004 +0000 @@ -381,7 +381,7 @@ g_return_if_fail(account != NULL); g_return_if_fail(username != NULL); - conv = gaim_find_conversation_with_account(username, account); + conv = gaim_find_conversation_with_account(GAIM_CONV_IM, username, account); if (conv == NULL) conv = gaim_conversation_new(GAIM_CONV_IM, account, username); @@ -765,7 +765,9 @@ GaimConversation *conv; buddy = (GaimBuddy*)bnode; bnode = bnode->next; - conv = gaim_find_conversation_with_account(buddy->name, buddy->account); + conv = gaim_find_conversation_with_account(GAIM_CONV_IM, + buddy->name, + buddy->account); if (gaim_account_is_connected(buddy->account)) { serv_remove_buddy(buddy->account->gc, buddy, group); gaim_blist_remove_buddy(buddy); @@ -807,6 +809,7 @@ g_free(text); } +/* XXX - Some of this should be moved into the core, methinks. */ static void gaim_gtkdialogs_remove_buddy_cb(GaimBuddy *buddy) { @@ -824,8 +827,7 @@ serv_remove_buddy(buddy->account->gc, buddy, group); gaim_blist_remove_buddy(buddy); - conv = gaim_find_conversation_with_account(name, account); - + conv = gaim_find_conversation_with_account(GAIM_CONV_IM, name, account); if (conv != NULL) gaim_conversation_update(conv, GAIM_CONV_UPDATE_REMOVE); @@ -864,7 +866,7 @@ gaim_blist_remove_chat(chat); if (name != NULL) { - conv = gaim_find_conversation_with_account(name, account); + conv = gaim_find_conversation_with_account(GAIM_CONV_CHAT, name, account); g_free(name); }