Mercurial > pidgin.yaz
diff plugins/tcl/tcl_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 | dae370949a39 |
| children | ae682fa78d7f |
line wrap: on
line diff
--- a/plugins/tcl/tcl_cmds.c Thu Aug 25 00:27:12 2005 +0000 +++ b/plugins/tcl/tcl_cmds.c Thu Aug 25 02:33:44 2005 +0000 @@ -488,7 +488,7 @@ return error; if (!tcl_validate_account(account, interp)) return TCL_ERROR; - convo = gaim_find_conversation_with_account(GAIM_CONV_ANY, + convo = gaim_find_conversation_with_account(GAIM_CONV_TYPE_ANY, Tcl_GetString(objv[3]), account); Tcl_SetIntObj(result, (int)convo); @@ -514,7 +514,7 @@ return TCL_ERROR; } argsused = 2; - type = GAIM_CONV_IM; + type = GAIM_CONV_TYPE_IM; while (argsused < objc) { opt = Tcl_GetString(objv[argsused]); if (*opt == '-') { @@ -524,10 +524,10 @@ argsused++; switch (newopt) { case CMD_CONV_NEW_CHAT: - type = GAIM_CONV_CHAT; + type = GAIM_CONV_TYPE_CHAT; break; case CMD_CONV_NEW_IM: - type = GAIM_CONV_IM; + type = GAIM_CONV_TYPE_IM; break; } } else { @@ -570,7 +570,7 @@ flags = GAIM_MESSAGE_SYSTEM; break; } - if (gaim_conversation_get_type(convo) == GAIM_CONV_CHAT) + if (gaim_conversation_get_type(convo) == GAIM_CONV_TYPE_CHAT) gaim_conv_chat_write(GAIM_CONV_CHAT(convo), from, what, flags, time(NULL)); else gaim_conv_im_write(GAIM_CONV_IM(convo), from, what, flags, time(NULL));