Updates so that DCC stuff compiles again. Still missing DCC chat/get/send

specific stuff.


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1208 dbcabf3a-b0e7-0310-adc4-f8d773084564

2 files changed, 4 insertions, 68 deletions

diff --git a/src/perl/irc/Dcc.xs b/src/perl/irc/Dcc.xs
index 2d45d506..f65d2c70 100644
--- a/src/perl/irc/Dcc.xs
+++ b/src/perl/irc/Dcc.xs
@@ -22,76 +22,17 @@ dcc_find_request(type, nick, arg)
 	char *arg
 
 char *
-dcc_type2str(type)
-	int type
-CODE:
-	RETVAL = (char *) dcc_type2str(type);
-OUTPUT:
-	RETVAL
-
-int
-dcc_str2type(type)
-	char *type
-
-Irssi::Irc::Dcc
-dcc_create(type, nick, arg, server, chat)
-	int type
-	char *nick
-	char *arg
-	Irssi::Irc::Server server
-	Irssi::Irc::Dcc chat
-
-Irssi::Irc::Dcc
-dcc_chat_find_id(id)
-	char *id
-
-char *
 dcc_get_download_path(fname)
 	char *fname
 
 #*******************************
-MODULE = Irssi::Irc  PACKAGE = Irssi::Windowitem PREFIX = item_
-#*******************************
-
-Irssi::Irc::Dcc
-item_get_dcc(item)
-	Irssi::Windowitem item
-
-#*******************************
-MODULE = Irssi::Irc  PACKAGE = Irssi::Irc::Server
-#*******************************
-
-void
-dcc_ctcp_message(server, target, notice, msg)
-	Irssi::Irc::Server server
-	char *target
-	int notice
-	char *msg
-CODE:
-	dcc_ctcp_message(server, target, NULL, notice, msg);
-
-#*******************************
 MODULE = Irssi::Irc  PACKAGE = Irssi::Irc::Dcc  PREFIX = dcc_
 #*******************************
 
 void
-dcc_ctcp_message(chat, target, notice, msg)
-	Irssi::Irc::Dcc chat
-	char *target
-	int notice
-	char *msg
-CODE:
-	dcc_ctcp_message(chat->server, target, chat, notice, msg);
-
-void
 dcc_destroy(dcc)
 	Irssi::Irc::Dcc dcc
 
-void
-dcc_chat_send(dcc, data)
-	Irssi::Irc::Dcc dcc
-	char *data
-
 void 
 dcc_reject(dcc, server)
 	Irssi::Irc::Dcc dcc
diff --git a/src/perl/irc/Irc.xs b/src/perl/irc/Irc.xs
index 4ed3e995..ba9f9f20 100644
--- a/src/perl/irc/Irc.xs
+++ b/src/perl/irc/Irc.xs
@@ -26,28 +26,23 @@ static void perl_dcc_fill_hash(HV *hv, DCC_REC *dcc)
 {
 	HV *stash;
 
-	hv_store(hv, "type", 4, new_pv((char *) dcc_type2str(dcc->type)), 0);
 	hv_store(hv, "created", 7, newSViv(dcc->created), 0);
 
 	hv_store(hv, "server", 6, irssi_bless(dcc->server), 0);
+	hv_store(hv, "servertag", 9, new_pv(dcc->servertag), 0);
+	hv_store(hv, "mynick", 6, new_pv(dcc->mynick), 0);
 	hv_store(hv, "nick", 4, new_pv(dcc->nick), 0);
 
 	stash = gv_stashpv("Irssi::Irc::Dcc", 0);
 	hv_store(hv, "chat", 4, new_bless(dcc->chat, stash), 0);
-
-	hv_store(hv, "ircnet", 6, new_pv(dcc->ircnet), 0);
-	hv_store(hv, "mynick", 6, new_pv(dcc->mynick), 0);
-
+	hv_store(hv, "target", 6, new_pv(dcc->target), 0);
 	hv_store(hv, "arg", 3, new_pv(dcc->arg), 0);
-	hv_store(hv, "file", 4, new_pv(dcc->file), 0);
 
 	hv_store(hv, "addr", 4, new_pv(dcc->addrstr), 0);
 	hv_store(hv, "port", 4, newSViv(dcc->port), 0);
 
-	hv_store(hv, "size", 4, newSViv(dcc->size), 0);
-	hv_store(hv, "transfd", 7, newSViv(dcc->transfd), 0);
-	hv_store(hv, "skipped", 7, newSViv(dcc->skipped), 0);
 	hv_store(hv, "starttime", 9, newSViv(dcc->starttime), 0);
+	hv_store(hv, "transfd", 7, newSViv(dcc->transfd), 0);
 }
 
 static void perl_netsplit_fill_hash(HV *hv, NETSPLIT_REC *netsplit)