Mercurial > pidgin
diff src/gtkpounce.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 | a511b77a368b |
| children | 58bc500cf226 |
line wrap: on
line diff
--- a/src/gtkpounce.c Thu Aug 25 00:27:12 2005 +0000 +++ b/src/gtkpounce.c Thu Aug 25 02:33:44 2005 +0000 @@ -944,10 +944,10 @@ if (gaim_pounce_action_is_enabled(pounce, "open-window")) { - conv = gaim_find_conversation_with_account(GAIM_CONV_IM, pouncee, account); + conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, pouncee, account); if (conv == NULL) - conv = gaim_conversation_new(GAIM_CONV_IM, account, pouncee); + conv = gaim_conversation_new(GAIM_CONV_TYPE_IM, account, pouncee); } if (gaim_pounce_action_is_enabled(pounce, "popup-notify")) @@ -999,10 +999,10 @@ if (message != NULL) { - conv = gaim_find_conversation_with_account(GAIM_CONV_IM, pouncee, account); + conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, pouncee, account); if (conv == NULL) - conv = gaim_conversation_new(GAIM_CONV_IM, account, pouncee); + conv = gaim_conversation_new(GAIM_CONV_TYPE_IM, account, pouncee); gaim_conversation_write(conv, NULL, message, GAIM_MESSAGE_SEND, time(NULL));