comparison 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
comparison
equal deleted inserted replaced
11337:1462b64f8fc9 11338:17142948653e
214 GaimCmdRet ret = GAIM_CMD_RET_CONTINUE; 214 GaimCmdRet ret = GAIM_CMD_RET_CONTINUE;
215 215
216 *error = NULL; 216 *error = NULL;
217 prpl_id = gaim_account_get_protocol_id(gaim_conversation_get_account(conv)); 217 prpl_id = gaim_account_get_protocol_id(gaim_conversation_get_account(conv));
218 218
219 if (gaim_conversation_get_type(conv) == GAIM_CONV_IM) 219 if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM)
220 is_im = TRUE; 220 is_im = TRUE;
221 else if (gaim_conversation_get_type(conv) == GAIM_CONV_CHAT) 221 else if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_CHAT)
222 is_im = FALSE; 222 is_im = FALSE;
223 else 223 else
224 return GAIM_CMD_STATUS_FAILED; 224 return GAIM_CMD_STATUS_FAILED;
225 225
226 rest = strchr(cmdline, ' '); 226 rest = strchr(cmdline, ' ');
315 GList *l; 315 GList *l;
316 316
317 for (l = cmds; l; l = l->next) { 317 for (l = cmds; l; l = l->next) {
318 c = l->data; 318 c = l->data;
319 319
320 if (conv && (gaim_conversation_get_type(conv) == GAIM_CONV_IM)) 320 if (conv && (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM))
321 if (!(c->flags & GAIM_CMD_FLAG_IM)) 321 if (!(c->flags & GAIM_CMD_FLAG_IM))
322 continue; 322 continue;
323 if (conv && (gaim_conversation_get_type(conv) == GAIM_CONV_CHAT)) 323 if (conv && (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_CHAT))
324 if (!(c->flags & GAIM_CMD_FLAG_CHAT)) 324 if (!(c->flags & GAIM_CMD_FLAG_CHAT))
325 continue; 325 continue;
326 326
327 if (conv && (c->flags & GAIM_CMD_FLAG_PRPL_ONLY) && c->prpl_id && 327 if (conv && (c->flags & GAIM_CMD_FLAG_PRPL_ONLY) && c->prpl_id &&
328 (strcmp(c->prpl_id, gaim_account_get_protocol_id(gaim_conversation_get_account(conv))) != 0)) 328 (strcmp(c->prpl_id, gaim_account_get_protocol_id(gaim_conversation_get_account(conv))) != 0))
345 c = l->data; 345 c = l->data;
346 346
347 if (cmd && (strcmp(cmd, c->cmd) != 0)) 347 if (cmd && (strcmp(cmd, c->cmd) != 0))
348 continue; 348 continue;
349 349
350 if (conv && (gaim_conversation_get_type(conv) == GAIM_CONV_IM)) 350 if (conv && (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM))
351 if (!(c->flags & GAIM_CMD_FLAG_IM)) 351 if (!(c->flags & GAIM_CMD_FLAG_IM))
352 continue; 352 continue;
353 if (conv && (gaim_conversation_get_type(conv) == GAIM_CONV_CHAT)) 353 if (conv && (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_CHAT))
354 if (!(c->flags & GAIM_CMD_FLAG_CHAT)) 354 if (!(c->flags & GAIM_CMD_FLAG_CHAT))
355 continue; 355 continue;
356 356
357 if (conv && (c->flags & GAIM_CMD_FLAG_PRPL_ONLY) && c->prpl_id && 357 if (conv && (c->flags & GAIM_CMD_FLAG_PRPL_ONLY) && c->prpl_id &&
358 (strcmp(c->prpl_id, gaim_account_get_protocol_id(gaim_conversation_get_account(conv))) != 0)) 358 (strcmp(c->prpl_id, gaim_account_get_protocol_id(gaim_conversation_get_account(conv))) != 0))