summaryrefslogtreecommitdiff
path: root/src/irc
diff options
context:
space:
mode:
authorTimo Sirainen <cras@irssi.org>2002-01-09 16:04:53 +0000
committercras <cras@dbcabf3a-b0e7-0310-adc4-f8d773084564>2002-01-09 16:04:53 +0000
commit6e4730b65dfaa034f9160291df1307d849fe61c4 (patch)
tree92d6c21278b85b18d6d516fc84af49b6ec8465bf /src/irc
parenta01aab7a649b73cee3e7a73ade21498293f1a03e (diff)
downloadirssi-6e4730b65dfaa034f9160291df1307d849fe61c4.zip
Added "message dcc xxx" signals for printing DCC messages.
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2298 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src/irc')
-rw-r--r--src/irc/dcc/dcc-chat.c26
1 files changed, 16 insertions, 10 deletions
diff --git a/src/irc/dcc/dcc-chat.c b/src/irc/dcc/dcc-chat.c
index 8ca8f8bc..af0084c8 100644
--- a/src/irc/dcc/dcc-chat.c
+++ b/src/irc/dcc/dcc-chat.c
@@ -574,7 +574,7 @@ static void ctcp_msg_dcc_chat(IRC_SERVER_REC *server, const char *data,
/* DCC CHAT: text received */
static void dcc_chat_msg(CHAT_DCC_REC *dcc, const char *msg)
{
- char *cmd, *ptr;
+ char *event, *cmd, *ptr;
int reply;
g_return_if_fail(IS_DCC_CHAT(dcc));
@@ -600,23 +600,29 @@ static void dcc_chat_msg(CHAT_DCC_REC *dcc, const char *msg)
return;
/* get ctcp command, remove \001 chars */
- cmd = g_strconcat(reply ? "dcc reply " : "dcc ctcp ", msg+1, NULL);
- if (cmd[strlen(cmd)-1] == 1) cmd[strlen(cmd)-1] = '\0';
+ event = g_strconcat(reply ? "dcc reply " : "dcc ctcp ", msg+1, NULL);
+ if (event[strlen(event)-1] == 1) event[strlen(event)-1] = '\0';
- ptr = strchr(cmd+(reply ? 10 : 9), ' ');
+ cmd = event + (reply ? 10 : 9);
+ ptr = strchr(cmd, ' ');
if (ptr != NULL) *ptr++ = '\0'; else ptr = "";
- g_strdown(cmd+9);
- if (!signal_emit(cmd, 2, ptr, dcc)) {
+ cmd = g_strdup(cmd);
+ g_strup(cmd);
+
+ g_strdown(event+9);
+ if (!signal_emit(event, 2, dcc, ptr)) {
signal_emit(reply ? "default dcc reply" :
- "default dcc ctcp", 2, msg, dcc);
+ "default dcc ctcp", 3, dcc, cmd, ptr);
}
- g_free(cmd);
+
+ g_free(cmd);
+ g_free(event);
signal_stop();
}
-static void dcc_ctcp_redirect(const char *msg, CHAT_DCC_REC *dcc)
+static void dcc_ctcp_redirect(CHAT_DCC_REC *dcc, const char *msg)
{
g_return_if_fail(msg != NULL);
g_return_if_fail(IS_DCC_CHAT(dcc));
@@ -625,7 +631,7 @@ static void dcc_ctcp_redirect(const char *msg, CHAT_DCC_REC *dcc)
dcc->nick, "dcc", dcc->mynick, dcc);
}
-static void dcc_ctcp_reply_redirect(const char *msg, CHAT_DCC_REC *dcc)
+static void dcc_ctcp_reply_redirect(CHAT_DCC_REC *dcc, const char *msg)
{
g_return_if_fail(msg != NULL);
g_return_if_fail(IS_DCC_CHAT(dcc));