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

Lots of moving stuff around - hopefully I didn't break too much :)

Browse source 
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@632 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2000-08-26 15:39:44 +00:00 • committed by cras
commit e395e87ded
160 changed files with 3954 additions and 2959 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -29,8 +29,8 @@
#include "masks.h"
#include "irc.h"
#include "server-setup.h"
#include "query.h"
#include "servers-setup.h"
#include "irc-queries.h"
#include "dcc.h"
@ -50,10 +50,11 @@ DCC_REC *item_get_dcc(void *item)
{
QUERY_REC *query;
query = irc_item_query(item);
if (query == NULL || *query->nick != '=') return NULL;
query = IRC_QUERY(item);
if (query == NULL || *query->name != '=')
return NULL;
return dcc_find_item(DCC_TYPE_CHAT, query->nick+1, NULL);
return dcc_find_item(DCC_TYPE_CHAT, query->name+1, NULL);
}
/* Send text to DCC chat */
@ -81,7 +82,7 @@ static void cmd_msg(const char *data)
signal_stop();
}
static void cmd_me(const char *data, IRC_SERVER_REC *server, WI_IRC_REC *item)
static void cmd_me(const char *data, IRC_SERVER_REC *server, QUERY_REC *item)
{
DCC_REC *dcc;
char *str;
@ -309,7 +310,7 @@ static void cmd_dcc_chat(const char *data, IRC_SERVER_REC *server)
}
/* SYNTAX: MIRCDCC ON|OFF */
static void cmd_mircdcc(const char *data, IRC_SERVER_REC *server, WI_IRC_REC *item)
static void cmd_mircdcc(const char *data, IRC_SERVER_REC *server, QUERY_REC *item)
{
DCC_REC *dcc;

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

@ -29,7 +29,7 @@
#include "masks.h"
#include "irc.h"
#include "server-setup.h"
#include "servers-setup.h"
#include "dcc.h"
@ -495,7 +495,7 @@ static void dcc_send_init(DCC_REC *dcc)
}
/* SYNTAX: DCC SEND <nick> <file> */
static void cmd_dcc_send(const char *data, IRC_SERVER_REC *server, WI_IRC_REC *item)
static void cmd_dcc_send(const char *data, IRC_SERVER_REC *server, void *item)
{
char *target, *fname, *str, *ptr;
void *free_arg;

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

@ -76,7 +76,7 @@ DCC_REC *dcc_create(int type, int handle, const char *nick, const char *arg,
dcc->ircnet = server == NULL ?
(chat == NULL || chat->ircnet == NULL ? NULL : g_strdup(chat->ircnet)) :
(server->connrec->ircnet == NULL ? NULL : g_strdup(server->connrec->ircnet));
(server->connrec->chatnet == NULL ? NULL : g_strdup(server->connrec->chatnet));
dcc_conns = g_slist_append(dcc_conns, dcc);
signal_emit("dcc created", 1, dcc);
@ -222,14 +222,14 @@ static void dcc_server_connected(IRC_SERVER_REC *server)
g_return_if_fail(server != NULL);
if (server->connrec->ircnet == NULL)
if (server->connrec->chatnet == NULL)
return;
for (tmp = dcc_conns; tmp != NULL; tmp = tmp->next) {
DCC_REC *dcc = tmp->data;
if (dcc->server == NULL && dcc->ircnet != NULL &&
g_strcasecmp(dcc->ircnet, server->connrec->ircnet) == 0) {
g_strcasecmp(dcc->ircnet, server->connrec->chatnet) == 0) {
dcc->server = server;
g_free(dcc->mynick);
dcc->mynick = g_strdup(server->nick);
@ -253,7 +253,7 @@ static void dcc_server_disconnected(IRC_SERVER_REC *server)
if (dcc->ircnet == NULL)
dcc->server = NULL;
else {
dcc->server = (IRC_SERVER_REC *) server_find_ircnet(dcc->ircnet);
dcc->server = (IRC_SERVER_REC *) server_find_chatnet(dcc->ircnet);
if (dcc->server != NULL) {
g_free(dcc->mynick);
dcc->mynick = g_strdup(dcc->server->nick);
@ -309,7 +309,7 @@ static void dcc_ctcp_msg(char *data, IRC_SERVER_REC *server, char *sender, char
case DCC_TYPE_GET:
cstr = settings_get_str("dcc_autoget_masks");
/* check that autoget masks match */
if (settings_get_bool("dcc_autoget") && (*cstr == '\0' || irc_masks_match(cstr, sender, sendaddr)) &&
if (settings_get_bool("dcc_autoget") && (*cstr == '\0' || masks_match(SERVER(server), cstr, sender, sendaddr)) &&
/* check file size limit, FIXME: it's possible to send a bogus file size and then just send what ever sized file.. */
(settings_get_int("dcc_max_autoget_size") <= 0 || (settings_get_int("dcc_max_autoget_size") > 0 && size <= settings_get_int("dcc_max_autoget_size")*1024)))
{
@ -327,7 +327,7 @@ static void dcc_ctcp_msg(char *data, IRC_SERVER_REC *server, char *sender, char
case DCC_TYPE_CHAT:
cstr = settings_get_str("dcc_autochat_masks");
if (*cstr != '\0' && irc_masks_match(cstr, sender, sendaddr))
if (*cstr != '\0' && masks_match(SERVER(server), cstr, sender, sendaddr))
{
/* automatically accept chat */
str = g_strdup_printf("CHAT %s", dcc->nick);
@ -454,7 +454,7 @@ static void cmd_dcc_close(char *data, IRC_SERVER_REC *server)
cmd_params_free(free_arg);
}
static void cmd_dcc(const char *data, IRC_SERVER_REC *server, WI_IRC_REC *item)
static void cmd_dcc(const char *data, IRC_SERVER_REC *server, void *item)
{
command_runsub("dcc", data, server, item);
}