Mercurial > pidgin.yaz
diff src/protocols/sametime/sametime.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 | a26eb48d1953 |
line wrap: on
line diff
--- a/src/protocols/sametime/sametime.c Thu Aug 25 00:27:12 2005 +0000 +++ b/src/protocols/sametime/sametime.c Thu Aug 25 02:33:44 2005 +0000 @@ -961,7 +961,7 @@ if(pd->gc != gc) return; /* not ours */ - if(gaim_conversation_get_type(g_conv) != GAIM_CONV_IM) + if(gaim_conversation_get_type(g_conv) != GAIM_CONV_TYPE_IM) return; /* wrong type */ who.user = (char *) gaim_conversation_get_name(g_conv); @@ -1968,7 +1968,7 @@ idb = mwConversation_getTarget(conv); - return gaim_find_conversation_with_account(GAIM_CONV_IM,idb->user, acct); + return gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM,idb->user, acct); } @@ -2119,9 +2119,9 @@ idb = mwConversation_getTarget(conv); - gconv = gaim_find_conversation_with_account(GAIM_CONV_IM, idb->user, acct); + gconv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, idb->user, acct); if(! gconv) { - gconv = gaim_conversation_new(GAIM_CONV_IM, acct, idb->user); + gconv = gaim_conversation_new(GAIM_CONV_TYPE_IM, acct, idb->user); } g_return_if_fail(gconv != NULL);