zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-18 16:12:30 +02:00
Code Issues Projects Releases Packages Wiki Activity

Server events: switched order of data and server parameters. it's now

Browse source 
SERVER_REC *server, const char *data, .. hope this doesn't cause too
many problems :)


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@967 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2000-12-05 21:12:52 +00:00 • committed by cras
commit 9f2f1dc70a
32 changed files with 246 additions and 225 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/irc/dcc/dcc-chat.c
View file

@ -93,7 +93,7 @@ static void cmd_me(const char *data, IRC_SERVER_REC *server, QUERY_REC *item)
if (dcc == NULL) return;
str = g_strdup_printf("ACTION %s", data);
dcc_ctcp_message(dcc->nick, NULL, dcc, FALSE, str);
dcc_ctcp_message(NULL, dcc->nick, dcc, FALSE, str);
g_free(str);
signal_stop();
@ -119,7 +119,7 @@ static void cmd_action(const char *data, IRC_SERVER_REC *server)
dcc = dcc_find_item(DCC_TYPE_CHAT, target+1, NULL);
if (dcc != NULL) {
str = g_strdup_printf("ACTION %s", text);
dcc_ctcp_message(dcc->nick, NULL, dcc, FALSE, str);
dcc_ctcp_message(NULL, dcc->nick, dcc, FALSE, str);
g_free(str);
}
@ -151,7 +151,7 @@ static void cmd_ctcp(const char *data, IRC_SERVER_REC *server)
g_strup(ctcpcmd);
str = g_strdup_printf("%s %s", ctcpcmd, ctcpdata);
dcc_ctcp_message(dcc->nick, NULL, dcc, FALSE, str);
dcc_ctcp_message(NULL, dcc->nick, dcc, FALSE, str);
g_free(str);
}
@ -375,7 +375,7 @@ static void dcc_ctcp_redirect(gchar *msg, DCC_REC *dcc)
g_return_if_fail(msg != NULL);
g_return_if_fail(dcc != NULL);
signal_emit("ctcp msg dcc", 6, msg, dcc->server, dcc->nick, "dcc", dcc->mynick, dcc);
signal_emit("ctcp msg dcc", 6, dcc->server, msg, dcc->nick, "dcc", dcc->mynick, dcc);
}
void dcc_chat_init(void)

8
src/irc/dcc/dcc-files.c
View file

@ -253,7 +253,7 @@ static void dcc_resume_send(DCC_REC *dcc, int port)
str = g_strdup_printf("DCC ACCEPT %s %d %lu",
dcc->arg, port, dcc->transfd);
dcc_ctcp_message(dcc->nick, dcc->server, dcc->chat, FALSE, str);
dcc_ctcp_message(dcc->server, dcc->nick, dcc->chat, FALSE, str);
g_free(str);
}
@ -270,7 +270,7 @@ static void dcc_resume_send(DCC_REC *dcc, int port)
((dcc)->type == DCC_TYPE_GET && \
(dcc)->get_type == DCC_GET_RESUME && (dcc)->handle == NULL))
static void dcc_ctcp_msg(const char *data, IRC_SERVER_REC *server,
static void dcc_ctcp_msg(IRC_SERVER_REC *server, const char *data,
const char *sender, const char *sendaddr,
const char *target, DCC_REC *chat)
{
@ -335,7 +335,7 @@ static void dcc_resume_rec(DCC_REC *dcc)
str = g_strdup_printf("DCC RESUME %s %d %lu",
dcc->arg, dcc->port, dcc->transfd);
dcc_ctcp_message(dcc->nick, dcc->server, dcc->chat, FALSE, str);
dcc_ctcp_message(dcc->server, dcc->nick, dcc->chat, FALSE, str);
g_free(str);
}
@ -582,7 +582,7 @@ static void cmd_dcc_send(const char *data, IRC_SERVER_REC *server, void *item)
dcc_make_address(&own_ip, host);
str = g_strdup_printf("DCC SEND %s %s %d %lu",
fname, host, port, fsize);
dcc_ctcp_message(target, server, chat, FALSE, str);
dcc_ctcp_message(server, target, chat, FALSE, str);
g_free(str);
g_free(fname);

14
src/irc/dcc/dcc.c
View file

@ -197,7 +197,8 @@ int dcc_str2type(const char *type)
return 0;
}
void dcc_ctcp_message(const char *target, IRC_SERVER_REC *server, DCC_REC *chat, int notice, const char *msg)
void dcc_ctcp_message(IRC_SERVER_REC *server, const char *target,
DCC_REC *chat, int notice, const char *msg)
{
char *str;
@ -279,7 +280,9 @@ static void dcc_get_address(const char *str, IPADDR *ip)
}
/* Handle incoming DCC CTCP messages */
static void dcc_ctcp_msg(char *data, IRC_SERVER_REC *server, char *sender, char *sendaddr, char *target, DCC_REC *chat)
static void dcc_ctcp_msg(IRC_SERVER_REC *server, char *data,
char *sender, char *sendaddr,
char *target, DCC_REC *chat)
{
char *type, *arg, *addrstr, *portstr, *sizestr, *str;
void *free_arg;
@ -379,7 +382,8 @@ static void dcc_ctcp_msg(char *data, IRC_SERVER_REC *server, char *sender, char
}
/* Handle incoming DCC CTCP replies */
static void dcc_ctcp_reply(char *data, IRC_SERVER_REC *server, char *sender, char *sendaddr)
static void dcc_ctcp_reply(IRC_SERVER_REC *server, char *data,
char *sender, char *sendaddr)
{
char *cmd, *subcmd, *args;
void *free_arg;
@ -433,7 +437,7 @@ static void dcc_reject(DCC_REC *dcc, IRC_SERVER_REC *server)
}
/* SYNTAX: DCC CLOSE <type> <nick> [<file>] */
static void cmd_dcc_close(char *data, IRC_SERVER_REC *server)
static void cmd_dcc_close(IRC_SERVER_REC *server, char *data)
{
DCC_REC *dcc;
GSList *tmp, *next;
@ -502,7 +506,7 @@ static int dcc_timeout_func(void)
return 1;
}
static void event_no_such_nick(char *data, IRC_SERVER_REC *server)
static void event_no_such_nick(IRC_SERVER_REC *server, char *data)
{
char *params, *nick;
GSList *tmp, *next;

6
src/irc/dcc/dcc.h
View file

@ -80,12 +80,14 @@ const char *dcc_type2str(int type);
int dcc_str2type(const char *type);
void dcc_make_address(IPADDR *ip, char *host);
DCC_REC *dcc_create(int type, GIOChannel *handle, const char *nick, const char *arg, IRC_SERVER_REC *server, DCC_REC *chat);
DCC_REC *dcc_create(int type, GIOChannel *handle, const char *nick,
const char *arg, IRC_SERVER_REC *server, DCC_REC *chat);
void dcc_destroy(DCC_REC *dcc);
/* Send a CTCP message/notify to target. Send the CTCP via DCC chat if
`chat' is specified. */
void dcc_ctcp_message(const char *target, IRC_SERVER_REC *server, DCC_REC *chat, int notice, const char *msg);
void dcc_ctcp_message(IRC_SERVER_REC *server, const char *target,
DCC_REC *chat, int notice, const char *msg);
/* Send `data' to dcc chat. */
void dcc_chat_send(DCC_REC *dcc, const char *data);