Mercurial > pidgin.yaz
comparison 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 |
comparison
equal
deleted
inserted
replaced
11337:1462b64f8fc9 | 11338:17142948653e |
---|---|
942 | 942 |
943 alias = gaim_buddy_get_alias(buddy); | 943 alias = gaim_buddy_get_alias(buddy); |
944 | 944 |
945 if (gaim_pounce_action_is_enabled(pounce, "open-window")) | 945 if (gaim_pounce_action_is_enabled(pounce, "open-window")) |
946 { | 946 { |
947 conv = gaim_find_conversation_with_account(GAIM_CONV_IM, pouncee, account); | 947 conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, pouncee, account); |
948 | 948 |
949 if (conv == NULL) | 949 if (conv == NULL) |
950 conv = gaim_conversation_new(GAIM_CONV_IM, account, pouncee); | 950 conv = gaim_conversation_new(GAIM_CONV_TYPE_IM, account, pouncee); |
951 } | 951 } |
952 | 952 |
953 if (gaim_pounce_action_is_enabled(pounce, "popup-notify")) | 953 if (gaim_pounce_action_is_enabled(pounce, "popup-notify")) |
954 { | 954 { |
955 char tmp[1024]; | 955 char tmp[1024]; |
997 message = gaim_pounce_action_get_attribute(pounce, "send-message", | 997 message = gaim_pounce_action_get_attribute(pounce, "send-message", |
998 "message"); | 998 "message"); |
999 | 999 |
1000 if (message != NULL) | 1000 if (message != NULL) |
1001 { | 1001 { |
1002 conv = gaim_find_conversation_with_account(GAIM_CONV_IM, pouncee, account); | 1002 conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, pouncee, account); |
1003 | 1003 |
1004 if (conv == NULL) | 1004 if (conv == NULL) |
1005 conv = gaim_conversation_new(GAIM_CONV_IM, account, pouncee); | 1005 conv = gaim_conversation_new(GAIM_CONV_TYPE_IM, account, pouncee); |
1006 | 1006 |
1007 gaim_conversation_write(conv, NULL, message, | 1007 gaim_conversation_write(conv, NULL, message, |
1008 GAIM_MESSAGE_SEND, time(NULL)); | 1008 GAIM_MESSAGE_SEND, time(NULL)); |
1009 | 1009 |
1010 serv_send_im(account->gc, (char *)pouncee, (char *)message, 0); | 1010 serv_send_im(account->gc, (char *)pouncee, (char *)message, 0); |