2 files changed, 34 insertions, 12 deletions
diff --git a/src/perl/common/Core.xs b/src/perl/common/Core.xs
index bac9e90b..4be39a84 100644
--- a/src/perl/common/Core.xs
+++ b/src/perl/common/Core.xs
@@ -57,7 +57,39 @@ void
 timeout_remove(tag)
 	int tag
 CODE:
-	perl_timeout_remove(tag);
+	perl_source_remove(tag);
+
+
+int
+INPUT_READ()
+CODE:
+	RETVAL = G_INPUT_READ;
+OUTPUT:
+	RETVAL
+
+int
+INPUT_WRITE()
+CODE:
+	RETVAL = G_INPUT_WRITE;
+OUTPUT:
+	RETVAL
+
+int
+input_add(source, condition, func, data)
+	int source
+	int condition
+	char *func
+	char *data
+CODE:
+	RETVAL = perl_input_add(source, condition, func, data);
+OUTPUT:
+	RETVAL
+
+void
+input_remove(tag)
+	int tag
+CODE:
+	perl_source_remove(tag);
 
 int
 level2bits(str)
diff --git a/src/perl/common/Irssi.pm b/src/perl/common/Irssi.pm
index 62d5e442..7a4a262f 100644
--- a/src/perl/common/Irssi.pm
+++ b/src/perl/common/Irssi.pm
@@ -13,20 +13,10 @@ require Exporter;
 require DynaLoader;
 
 @ISA = qw(Exporter DynaLoader);
-@EXPORT = qw();
+@EXPORT = qw(INPUT_READ INPUT_WRITE);
 @EXPORT_OK = qw();
 
 bootstrap Irssi $VERSION;
 
-@Irssi::Ircnet::ISA = qw(Irssi::Chatnet);
-@Irssi::IrcServer::ISA = qw(Irssi::Server);
-@Irssi::IrcServerConnect::ISA = qw(Irssi::ServerConnect);
-@Irssi::IrcServerSetup::ISA = qw(Irssi::ServerSetup);
-
-@Irssi::Channel::ISA = qw(Irssi::WindowItem);
-@Irssi::Query::ISA = qw(Irssi::WindowItem);
-@Irssi::IrcChannel::ISA = qw(Irssi::Channel);
-@Irssi::IrcQuery::ISA = qw(Irssi::Query);
-
 1;