comparison: libpurple/cmds.c
libpurple/cmds.c
- branch
- next.minor
- changeset 25859
- b42be7bb9dac
- parent 23555
- 82dab41b4163
- child 28981
- 4e3922ab4844
equal
deleted
inserted
replaced
| 25857:f40a2e40f651 | 25859:b42be7bb9dac |
|---|---|
| 234 purple_cmd_strip_cmd_from_markup(mrest); | 234 purple_cmd_strip_cmd_from_markup(mrest); |
| 235 | 235 |
| 236 for (l = cmds; l; l = l->next) { | 236 for (l = cmds; l; l = l->next) { |
| 237 c = l->data; | 237 c = l->data; |
| 238 | 238 |
| 239 if (strcmp(c->cmd, cmd) != 0) | 239 if (!purple_strequal(c->cmd, cmd)) |
| 240 continue; | 240 continue; |
| 241 | 241 |
| 242 found = TRUE; | 242 found = TRUE; |
| 243 | 243 |
| 244 if (is_im) | 244 if (is_im) |
| 248 if (!(c->flags & PURPLE_CMD_FLAG_CHAT)) | 248 if (!(c->flags & PURPLE_CMD_FLAG_CHAT)) |
| 249 continue; | 249 continue; |
| 250 | 250 |
| 251 right_type = TRUE; | 251 right_type = TRUE; |
| 252 | 252 |
| 253 if ((c->flags & PURPLE_CMD_FLAG_PRPL_ONLY) && c->prpl_id && | 253 if ((c->flags & PURPLE_CMD_FLAG_PRPL_ONLY) && |
| 254 (strcmp(c->prpl_id, prpl_id) != 0)) | 254 !purple_strequal(c->prpl_id, prpl_id)) |
| 255 continue; | 255 continue; |
| 256 | 256 |
| 257 right_prpl = TRUE; | 257 right_prpl = TRUE; |
| 258 | 258 |
| 259 /* this checks the allow bad args flag for us */ | 259 /* this checks the allow bad args flag for us */ |
| 318 continue; | 318 continue; |
| 319 if (conv && (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT)) | 319 if (conv && (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT)) |
| 320 if (!(c->flags & PURPLE_CMD_FLAG_CHAT)) | 320 if (!(c->flags & PURPLE_CMD_FLAG_CHAT)) |
| 321 continue; | 321 continue; |
| 322 | 322 |
| 323 if (conv && (c->flags & PURPLE_CMD_FLAG_PRPL_ONLY) && c->prpl_id && | 323 if (conv && (c->flags & PURPLE_CMD_FLAG_PRPL_ONLY) && |
| 324 (strcmp(c->prpl_id, purple_account_get_protocol_id(purple_conversation_get_account(conv))) != 0)) | 324 !purple_strequal(c->prpl_id, purple_account_get_protocol_id(purple_conversation_get_account(conv)))) |
| 325 continue; | 325 continue; |
| 326 | 326 |
| 327 ret = g_list_append(ret, c->cmd); | 327 ret = g_list_append(ret, c->cmd); |
| 328 } | 328 } |
| 329 | 329 |
| 340 GList *l; | 340 GList *l; |
| 341 | 341 |
| 342 for (l = cmds; l; l = l->next) { | 342 for (l = cmds; l; l = l->next) { |
| 343 c = l->data; | 343 c = l->data; |
| 344 | 344 |
| 345 if (cmd && (strcmp(cmd, c->cmd) != 0)) | 345 if (cmd && !purple_strequal(cmd, c->cmd)) |
| 346 continue; | 346 continue; |
| 347 | 347 |
| 348 if (conv && (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM)) | 348 if (conv && (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM)) |
| 349 if (!(c->flags & PURPLE_CMD_FLAG_IM)) | 349 if (!(c->flags & PURPLE_CMD_FLAG_IM)) |
| 350 continue; | 350 continue; |
| 351 if (conv && (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT)) | 351 if (conv && (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT)) |
| 352 if (!(c->flags & PURPLE_CMD_FLAG_CHAT)) | 352 if (!(c->flags & PURPLE_CMD_FLAG_CHAT)) |
| 353 continue; | 353 continue; |
| 354 | 354 |
| 355 if (conv && (c->flags & PURPLE_CMD_FLAG_PRPL_ONLY) && c->prpl_id && | 355 if (conv && (c->flags & PURPLE_CMD_FLAG_PRPL_ONLY) && |
| 356 (strcmp(c->prpl_id, purple_account_get_protocol_id(purple_conversation_get_account(conv))) != 0)) | 356 !purple_strequal(c->prpl_id, purple_account_get_protocol_id(purple_conversation_get_account(conv)))) |
| 357 continue; | 357 continue; |
| 358 | 358 |
| 359 ret = g_list_append(ret, c->help); | 359 ret = g_list_append(ret, c->help); |
| 360 } | 360 } |
| 361 | 361 |
