Mercurial > pidgin
comparison src/gtkpounce.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 | b8b4769d9800 |
| children | 89a25444401c |
comparison
equal
deleted
inserted
replaced
| 10245:c143a3fac58d | 10246:a66cf83552dc |
|---|---|
| 937 | 937 |
| 938 alias = gaim_buddy_get_alias(buddy); | 938 alias = gaim_buddy_get_alias(buddy); |
| 939 | 939 |
| 940 if (gaim_pounce_action_is_enabled(pounce, "open-window")) | 940 if (gaim_pounce_action_is_enabled(pounce, "open-window")) |
| 941 { | 941 { |
| 942 conv = gaim_find_conversation_with_account(pouncee, account); | 942 conv = gaim_find_conversation_with_account(GAIM_CONV_IM, pouncee, account); |
| 943 | 943 |
| 944 if (conv == NULL) | 944 if (conv == NULL) |
| 945 conv = gaim_conversation_new(GAIM_CONV_IM, account, pouncee); | 945 conv = gaim_conversation_new(GAIM_CONV_IM, account, pouncee); |
| 946 } | 946 } |
| 947 | 947 |
| 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(pouncee, account); | 1002 conv = gaim_find_conversation_with_account(GAIM_CONV_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_IM, account, pouncee); |
| 1006 | 1006 |
| 1007 gaim_conversation_write(conv, NULL, message, | 1007 gaim_conversation_write(conv, NULL, message, |