Mercurial > pidgin.yaz
diff src/cmds.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 | 1a97d5e88d12 |
| children | bdf8081b1bc1 |
line wrap: on
line diff
--- a/src/cmds.c Thu Aug 25 00:27:12 2005 +0000 +++ b/src/cmds.c Thu Aug 25 02:33:44 2005 +0000 @@ -216,9 +216,9 @@ *error = NULL; prpl_id = gaim_account_get_protocol_id(gaim_conversation_get_account(conv)); - if (gaim_conversation_get_type(conv) == GAIM_CONV_IM) + if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM) is_im = TRUE; - else if (gaim_conversation_get_type(conv) == GAIM_CONV_CHAT) + else if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_CHAT) is_im = FALSE; else return GAIM_CMD_STATUS_FAILED; @@ -317,10 +317,10 @@ for (l = cmds; l; l = l->next) { c = l->data; - if (conv && (gaim_conversation_get_type(conv) == GAIM_CONV_IM)) + if (conv && (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM)) if (!(c->flags & GAIM_CMD_FLAG_IM)) continue; - if (conv && (gaim_conversation_get_type(conv) == GAIM_CONV_CHAT)) + if (conv && (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_CHAT)) if (!(c->flags & GAIM_CMD_FLAG_CHAT)) continue; @@ -347,10 +347,10 @@ if (cmd && (strcmp(cmd, c->cmd) != 0)) continue; - if (conv && (gaim_conversation_get_type(conv) == GAIM_CONV_IM)) + if (conv && (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM)) if (!(c->flags & GAIM_CMD_FLAG_IM)) continue; - if (conv && (gaim_conversation_get_type(conv) == GAIM_CONV_CHAT)) + if (conv && (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_CHAT)) if (!(c->flags & GAIM_CMD_FLAG_CHAT)) continue;