Mercurial > pidgin.yaz
diff plugins/notify.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 | caaacfede4ae |
| children | ef6e94bdda08 |
line wrap: on
line diff
--- a/plugins/notify.c Thu Aug 25 00:27:12 2005 +0000 +++ b/plugins/notify.c Thu Aug 25 02:33:44 2005 +0000 @@ -169,9 +169,9 @@ gaimwin = gaim_conversation_get_window(conv); /* If we aren't doing notifications for this type of conversation, return */ - if (((gaim_conversation_get_type(conv) == GAIM_CONV_IM) && + if (((gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM) && !gaim_prefs_get_bool("/plugins/gtk/X11/notify/type_im")) || - ((gaim_conversation_get_type(conv) == GAIM_CONV_CHAT) && + ((gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_CHAT) && !gaim_prefs_get_bool("/plugins/gtk/X11/notify/type_chat"))) return 0; @@ -268,7 +268,7 @@ GaimConversation *conv = NULL; if (gaim_prefs_get_bool("/plugins/gtk/X11/notify/notify_send")) { - conv = gaim_find_conversation_with_account(GAIM_CONV_IM, receiver, account); + conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, receiver, account); unnotify(conv, TRUE); } }