forked from PsychoticNinja/irssi
Broke DCC CHAT queries.
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2391 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
parent
7bdd3beb8e
commit
d1ade13a71
@ -229,29 +229,29 @@ static void sig_dcc_list_print(CHAT_DCC_REC *dcc)
|
|||||||
static void cmd_msg(const char *data)
|
static void cmd_msg(const char *data)
|
||||||
{
|
{
|
||||||
CHAT_DCC_REC *dcc;
|
CHAT_DCC_REC *dcc;
|
||||||
|
GHashTable *optlist;
|
||||||
char *text, *target;
|
char *text, *target;
|
||||||
void *free_arg;
|
void *free_arg;
|
||||||
|
|
||||||
g_return_if_fail(data != NULL);
|
g_return_if_fail(data != NULL);
|
||||||
|
|
||||||
if (*data != '=') {
|
if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_OPTIONS |
|
||||||
|
PARAM_FLAG_GETREST, "msg",
|
||||||
|
&optlist, &target, &text))
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (*target == '=') {
|
||||||
/* handle only DCC messages */
|
/* handle only DCC messages */
|
||||||
return;
|
dcc = dcc_chat_find_id(target+1);
|
||||||
}
|
if (dcc == NULL || dcc->sendbuf == NULL) {
|
||||||
|
printformat(NULL, NULL, MSGLEVEL_CLIENTERROR,
|
||||||
|
IRCTXT_DCC_CHAT_NOT_FOUND, target+1);
|
||||||
|
} else {
|
||||||
|
if (query_find(NULL, target) == NULL)
|
||||||
|
completion_last_message_add(target);
|
||||||
|
|
||||||
if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST,
|
signal_emit("message dcc own", 2, dcc, text);
|
||||||
&target, &text))
|
}
|
||||||
return;
|
|
||||||
|
|
||||||
dcc = dcc_chat_find_id(target+1);
|
|
||||||
if (dcc == NULL || dcc->sendbuf == NULL) {
|
|
||||||
printformat(NULL, NULL, MSGLEVEL_CLIENTERROR,
|
|
||||||
IRCTXT_DCC_CHAT_NOT_FOUND, target+1);
|
|
||||||
} else {
|
|
||||||
if (query_find(NULL, target) == NULL)
|
|
||||||
completion_last_message_add(target);
|
|
||||||
|
|
||||||
signal_emit("message dcc own", 2, dcc, text);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
cmd_params_free(free_arg);
|
cmd_params_free(free_arg);
|
||||||
|
@ -176,26 +176,27 @@ CHAT_DCC_REC *item_get_dcc(WI_ITEM_REC *item)
|
|||||||
static void cmd_msg(const char *data)
|
static void cmd_msg(const char *data)
|
||||||
{
|
{
|
||||||
CHAT_DCC_REC *dcc;
|
CHAT_DCC_REC *dcc;
|
||||||
|
GHashTable *optlist;
|
||||||
char *text, *target;
|
char *text, *target;
|
||||||
void *free_arg;
|
void *free_arg;
|
||||||
|
|
||||||
g_return_if_fail(data != NULL);
|
g_return_if_fail(data != NULL);
|
||||||
|
|
||||||
if (*data != '=') {
|
if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_OPTIONS |
|
||||||
/* handle only DCC messages */
|
PARAM_FLAG_GETREST, "msg",
|
||||||
|
&optlist, &target, &text))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
if (*target == '=') {
|
||||||
|
/* handle only DCC messages */
|
||||||
|
dcc = dcc_chat_find_id(target+1);
|
||||||
|
if (dcc != NULL && dcc->sendbuf != NULL)
|
||||||
|
dcc_chat_send(dcc, text);
|
||||||
|
|
||||||
|
signal_stop();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST,
|
|
||||||
&target, &text))
|
|
||||||
return;
|
|
||||||
|
|
||||||
dcc = dcc_chat_find_id(target+1);
|
|
||||||
if (dcc != NULL && dcc->sendbuf != NULL)
|
|
||||||
dcc_chat_send(dcc, text);
|
|
||||||
|
|
||||||
cmd_params_free(free_arg);
|
cmd_params_free(free_arg);
|
||||||
signal_stop();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void cmd_me(const char *data, SERVER_REC *server, QUERY_REC *item)
|
static void cmd_me(const char *data, SERVER_REC *server, QUERY_REC *item)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user