Mercurial > pidgin
diff src/gtkdialogs.c @ 11338:17142948653e
[gaim-migrate @ 13551]
Change the GAIM_CONV_IM and GAIM_CONV_CHAT enums to GAIM_CONV_TYPE_IM
and GAIM_CONV_TYPE_CHAT. This touched A LOT of files. Also combined
two oscar header files (one of them was small and dorky).
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Thu, 25 Aug 2005 02:33:44 +0000 |
| parents | 90be432e8385 |
| children | 448bc3b8eb63 |
line wrap: on
line diff
--- a/src/gtkdialogs.c Thu Aug 25 00:27:12 2005 +0000 +++ b/src/gtkdialogs.c Thu Aug 25 02:33:44 2005 +0000 @@ -516,10 +516,10 @@ g_return_if_fail(account != NULL); g_return_if_fail(username != NULL); - conv = gaim_find_conversation_with_account(GAIM_CONV_IM, username, account); + conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, username, account); if (conv == NULL) - conv = gaim_conversation_new(GAIM_CONV_IM, account, username); + conv = gaim_conversation_new(GAIM_CONV_TYPE_IM, account, username); win = gaim_conversation_get_window(conv); gtkwin = GAIM_GTK_WINDOW(win); @@ -829,7 +829,7 @@ GaimConversation *conv; buddy = (GaimBuddy*)bnode; bnode = bnode->next; - conv = gaim_find_conversation_with_account(GAIM_CONV_IM, + conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, buddy->name, buddy->account); if (gaim_account_is_connected(buddy->account)) { @@ -891,7 +891,7 @@ serv_remove_buddy(buddy->account->gc, buddy, group); gaim_blist_remove_buddy(buddy); - conv = gaim_find_conversation_with_account(GAIM_CONV_IM, name, account); + conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, name, account); if (conv != NULL) gaim_conversation_update(conv, GAIM_CONV_UPDATE_REMOVE); @@ -930,7 +930,7 @@ gaim_blist_remove_chat(chat); if (name != NULL) { - conv = gaim_find_conversation_with_account(GAIM_CONV_CHAT, name, account); + conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_CHAT, name, account); g_free(name); }