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

Removed targets from printformat()s so all those extra dcc messages

Browse source 
would go to status window instead of the dcc chat queries.


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@934 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2000-12-03 02:38:42 +00:00 • committed by cras
commit de0e6b0184
1 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/fe-common/irc/dcc/fe-dcc.c
View file

@ -49,18 +49,18 @@ static void dcc_connected(DCC_REC *dcc)
switch (dcc->type) { switch (dcc->type) {
case DCC_TYPE_CHAT: case DCC_TYPE_CHAT:
sender = g_strconcat("=", dcc->nick, NULL); sender = g_strconcat("=", dcc->nick, NULL);
printformat(dcc->server, sender, MSGLEVEL_DCC, IRCTXT_DCC_CHAT_CONNECTED, printformat(dcc->server, NULL, MSGLEVEL_DCC, IRCTXT_DCC_CHAT_CONNECTED,
dcc->nick, dcc->addrstr, dcc->port); dcc->nick, dcc->addrstr, dcc->port);
if (autocreate_dccquery && query_find(NULL, sender) == NULL) if (autocreate_dccquery && query_find(NULL, sender) == NULL)
irc_query_create(dcc->server, sender, TRUE); irc_query_create(dcc->server, sender, TRUE);
g_free(sender); g_free(sender);
break; break;
case DCC_TYPE_SEND: case DCC_TYPE_SEND:
printformat(dcc->server, dcc->nick, MSGLEVEL_DCC, IRCTXT_DCC_SEND_CONNECTED, printformat(dcc->server, NULL, MSGLEVEL_DCC, IRCTXT_DCC_SEND_CONNECTED,
dcc->arg, dcc->nick, dcc->addrstr, dcc->port); dcc->arg, dcc->nick, dcc->addrstr, dcc->port);
break; break;
case DCC_TYPE_GET: case DCC_TYPE_GET:
printformat(dcc->server, dcc->nick, MSGLEVEL_DCC, IRCTXT_DCC_GET_CONNECTED, printformat(dcc->server, NULL, MSGLEVEL_DCC, IRCTXT_DCC_GET_CONNECTED,
dcc->arg, dcc->nick, dcc->addrstr, dcc->port); dcc->arg, dcc->nick, dcc->addrstr, dcc->port);
break; break;
} }
@ -70,7 +70,7 @@ static void dcc_rejected(DCC_REC *dcc)
{ {
g_return_if_fail(dcc != NULL); g_return_if_fail(dcc != NULL);
printformat(dcc->server, dcc->nick, MSGLEVEL_DCC, IRCTXT_DCC_CLOSE, printformat(dcc->server, NULL, MSGLEVEL_DCC, IRCTXT_DCC_CLOSE,
dcc_type2str(dcc->type), dcc->nick, dcc->arg); dcc_type2str(dcc->type), dcc->nick, dcc->arg);
} }
@ -88,27 +88,27 @@ static void dcc_closed(DCC_REC *dcc)
switch (dcc->type) { switch (dcc->type) {
case DCC_TYPE_CHAT: case DCC_TYPE_CHAT:
sender = g_strconcat("=", dcc->nick, NULL); sender = g_strconcat("=", dcc->nick, NULL);
printformat(dcc->server, sender, MSGLEVEL_DCC, printformat(dcc->server, NULL, MSGLEVEL_DCC,
IRCTXT_DCC_CHAT_DISCONNECTED, dcc->nick); IRCTXT_DCC_CHAT_DISCONNECTED, dcc->nick);
g_free(sender); g_free(sender);
break; break;
case DCC_TYPE_SEND: case DCC_TYPE_SEND:
if (secs == -1) { if (secs == -1) {
/* aborted */ /* aborted */
printformat(dcc->server, dcc->nick, MSGLEVEL_DCC, IRCTXT_DCC_SEND_ABORTED, printformat(dcc->server, NULL, MSGLEVEL_DCC, IRCTXT_DCC_SEND_ABORTED,
dcc->arg, dcc->nick); dcc->arg, dcc->nick);
} else { } else {
printformat(dcc->server, dcc->nick, MSGLEVEL_DCC, IRCTXT_DCC_SEND_COMPLETE, printformat(dcc->server, NULL, MSGLEVEL_DCC, IRCTXT_DCC_SEND_COMPLETE,
dcc->arg, dcc->transfd/1024, dcc->nick, (long) secs, kbs); dcc->arg, dcc->transfd/1024, dcc->nick, (long) secs, kbs);
} }
break; break;
case DCC_TYPE_GET: case DCC_TYPE_GET:
if (secs == -1) { if (secs == -1) {
/* aborted */ /* aborted */
printformat(dcc->server, dcc->nick, MSGLEVEL_DCC, IRCTXT_DCC_GET_ABORTED, printformat(dcc->server, NULL, MSGLEVEL_DCC, IRCTXT_DCC_GET_ABORTED,
dcc->arg, dcc->nick); dcc->arg, dcc->nick);
} else { } else {
printformat(dcc->server, dcc->nick, MSGLEVEL_DCC, IRCTXT_DCC_GET_COMPLETE, printformat(dcc->server, NULL, MSGLEVEL_DCC, IRCTXT_DCC_GET_COMPLETE,
dcc->arg, dcc->transfd/1024, dcc->nick, (long) secs, kbs); dcc->arg, dcc->transfd/1024, dcc->nick, (long) secs, kbs);
} }
break; break;
@ -160,11 +160,11 @@ static void dcc_request(DCC_REC *dcc)
switch (dcc->type) { switch (dcc->type) {
case DCC_TYPE_CHAT: case DCC_TYPE_CHAT:
printformat(dcc->server, dcc->nick, MSGLEVEL_DCC, IRCTXT_DCC_CHAT, printformat(dcc->server, NULL, MSGLEVEL_DCC, IRCTXT_DCC_CHAT,
dcc->nick, dcc->addrstr, dcc->port); dcc->nick, dcc->addrstr, dcc->port);
break; break;
case DCC_TYPE_GET: case DCC_TYPE_GET:
printformat(dcc->server, dcc->nick, MSGLEVEL_DCC, IRCTXT_DCC_SEND, printformat(dcc->server, NULL, MSGLEVEL_DCC, IRCTXT_DCC_SEND,
dcc->nick, dcc->addrstr, dcc->port, dcc->arg, dcc->size); dcc->nick, dcc->addrstr, dcc->port, dcc->arg, dcc->size);
break; break;
} }
@ -174,7 +174,8 @@ static void dcc_error_connect(DCC_REC *dcc)
{ {
g_return_if_fail(dcc != NULL); g_return_if_fail(dcc != NULL);
printformat(dcc->server, dcc->nick, MSGLEVEL_DCC, IRCTXT_DCC_CONNECT_ERROR, dcc->addrstr, dcc->port); printformat(dcc->server, NULL, MSGLEVEL_DCC,
IRCTXT_DCC_CONNECT_ERROR, dcc->addrstr, dcc->port);
} }
static void dcc_error_file_create(DCC_REC *dcc, const char *fname) static void dcc_error_file_create(DCC_REC *dcc, const char *fname)