summaryrefslogtreecommitdiff
path: root/src/perl/irc
diff options
context:
space:
mode:
Diffstat (limited to 'src/perl/irc')
-rw-r--r--src/perl/irc/.cvsignore2
-rw-r--r--src/perl/irc/Channel.xs (renamed from src/perl/irc/IrcChannel.xs)7
-rw-r--r--src/perl/irc/Dcc.xs9
-rw-r--r--src/perl/irc/Irc.pm2
-rw-r--r--src/perl/irc/Irc.xs20
-rw-r--r--src/perl/irc/IrcQuery.xs7
-rw-r--r--src/perl/irc/Makefile.PL.in1
-rw-r--r--src/perl/irc/Modes.xs7
-rw-r--r--src/perl/irc/Netsplit.xs5
-rw-r--r--src/perl/irc/Notifylist.xs9
-rw-r--r--src/perl/irc/Query.xs10
-rw-r--r--src/perl/irc/Server.xs (renamed from src/perl/irc/IrcServer.xs)7
12 files changed, 56 insertions, 30 deletions
diff --git a/src/perl/irc/.cvsignore b/src/perl/irc/.cvsignore
index 092c3980..b99999fd 100644
--- a/src/perl/irc/.cvsignore
+++ b/src/perl/irc/.cvsignore
@@ -1,7 +1,7 @@
Makefile
Makefile.PL
-Irc.c
Irc.bs
+*.c
*.o
pm_to_blib
blib
diff --git a/src/perl/irc/IrcChannel.xs b/src/perl/irc/Channel.xs
index fb8ff3fc..bd88be79 100644
--- a/src/perl/irc/IrcChannel.xs
+++ b/src/perl/irc/Channel.xs
@@ -1,4 +1,7 @@
-MODULE = Irssi::Irc PACKAGE = Irssi::Irc::Channel PREFIX = irc_
+#include "module.h"
+
+MODULE = Irssi::Irc::Channel PACKAGE = Irssi::Irc::Channel PREFIX = irc_
+PROTOTYPES: ENABLE
void
bans(channel)
@@ -42,7 +45,7 @@ CODE:
OUTPUT:
RETVAL
-MODULE = Irssi::Irc PACKAGE = Irssi::Irc::Server PREFIX = irc_
+MODULE = Irssi::Irc::Channel PACKAGE = Irssi::Irc::Server PREFIX = irc_
Irssi::Irc::Channel
irc_channel_create(server, name, automatic)
diff --git a/src/perl/irc/Dcc.xs b/src/perl/irc/Dcc.xs
index 8b6d7155..a46f171f 100644
--- a/src/perl/irc/Dcc.xs
+++ b/src/perl/irc/Dcc.xs
@@ -1,4 +1,7 @@
-MODULE = Irssi::Irc PACKAGE = Irssi::Irc
+#include "module.h"
+
+MODULE = Irssi::Irc::Dcc PACKAGE = Irssi::Irc
+PROTOTYPES: ENABLE
void
dccs()
@@ -60,7 +63,7 @@ dcc_get_download_path(fname)
char *fname
#*******************************
-MODULE = Irssi::Irc PACKAGE = Irssi::Irc::Dcc PREFIX = dcc_
+MODULE = Irssi::Irc::Dcc PACKAGE = Irssi::Irc::Dcc PREFIX = dcc_
#*******************************
void
@@ -85,7 +88,7 @@ dcc_reject(dcc, server)
Irssi::Irc::Server server
#*******************************
-MODULE = Irssi::Irc PACKAGE = Irssi::Windowitem PREFIX = item_
+MODULE = Irssi::Irc::Dcc PACKAGE = Irssi::Windowitem PREFIX = item_
#*******************************
Irssi::Irc::Dcc::Chat
diff --git a/src/perl/irc/Irc.pm b/src/perl/irc/Irc.pm
index 48260a27..5baeba7e 100644
--- a/src/perl/irc/Irc.pm
+++ b/src/perl/irc/Irc.pm
@@ -7,7 +7,7 @@ package Irssi::Irc;
use strict;
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
-$VERSION = "0.8";
+$VERSION = "0.9";
require Exporter;
require DynaLoader;
diff --git a/src/perl/irc/Irc.xs b/src/perl/irc/Irc.xs
index 306e3a4f..3ab20ac4 100644
--- a/src/perl/irc/Irc.xs
+++ b/src/perl/irc/Irc.xs
@@ -178,11 +178,15 @@ CODE:
"@Irssi::Irc::Dcc::Send::ISA = qw(Irssi::Irc::Dcc);\n",
TRUE);
-INCLUDE: IrcServer.xs
-INCLUDE: IrcChannel.xs
-INCLUDE: IrcQuery.xs
-INCLUDE: Modes.xs
-INCLUDE: Netsplit.xs
-
-INCLUDE: Dcc.xs
-INCLUDE: Notifylist.xs
+void
+deinit()
+CODE:
+
+BOOT:
+ irssi_boot(Irc__Channel);
+ irssi_boot(Irc__Dcc);
+ irssi_boot(Irc__Modes);
+ irssi_boot(Irc__Netsplit);
+ irssi_boot(Irc__Notifylist);
+ irssi_boot(Irc__Query);
+ irssi_boot(Irc__Server);
diff --git a/src/perl/irc/IrcQuery.xs b/src/perl/irc/IrcQuery.xs
deleted file mode 100644
index db292852..00000000
--- a/src/perl/irc/IrcQuery.xs
+++ /dev/null
@@ -1,7 +0,0 @@
-MODULE = Irssi::Irc PACKAGE = Irssi::Irc::Server PREFIX = irc_
-
-Irssi::Irc::Query
-irc_query_create(server_tag, nick, automatic)
- char *server_tag
- char *nick
- int automatic
diff --git a/src/perl/irc/Makefile.PL.in b/src/perl/irc/Makefile.PL.in
index de7bbbff..8f1e94d5 100644
--- a/src/perl/irc/Makefile.PL.in
+++ b/src/perl/irc/Makefile.PL.in
@@ -2,6 +2,7 @@ use ExtUtils::MakeMaker;
WriteMakefile('NAME' => 'Irssi::Irc',
'LIBS' => '',
+ 'OBJECT' => '$(O_FILES)',
'TYPEMAPS' => ['../common/typemap'],
'INC' => '-I../../.. -I@top_srcdir@/src -I@top_srcdir@/src/core -I@top_srcdir@/src/irc/core -I@top_srcdir@/src/irc @GLIB_CFLAGS@',
'VERSION_FROM' => '@srcdir@/Irc.pm');
diff --git a/src/perl/irc/Modes.xs b/src/perl/irc/Modes.xs
index f3c2991f..e25c887f 100644
--- a/src/perl/irc/Modes.xs
+++ b/src/perl/irc/Modes.xs
@@ -1,4 +1,7 @@
-MODULE = Irssi::Irc PACKAGE = Irssi::Irc
+#include "module.h"
+
+MODULE = Irssi::Irc::Modes PACKAGE = Irssi::Irc
+PROTOTYPES: ENABLE
char *
modes_join(old, mode, channel)
@@ -7,7 +10,7 @@ modes_join(old, mode, channel)
int channel
#*******************************
-MODULE = Irssi::Irc PACKAGE = Irssi::Irc::Channel PREFIX = channel_
+MODULE = Irssi::Irc::Modes PACKAGE = Irssi::Irc::Channel PREFIX = channel_
#*******************************
char *
diff --git a/src/perl/irc/Netsplit.xs b/src/perl/irc/Netsplit.xs
index c6d7c6e8..e4ef85e4 100644
--- a/src/perl/irc/Netsplit.xs
+++ b/src/perl/irc/Netsplit.xs
@@ -1,4 +1,7 @@
-MODULE = Irssi::Irc PACKAGE = Irssi::Irc::Server
+#include "module.h"
+
+MODULE = Irssi::Irc::Netsplit PACKAGE = Irssi::Irc::Server
+PROTOTYPES: ENABLE
Irssi::Irc::Netsplit
netsplit_find(server, nick, address)
diff --git a/src/perl/irc/Notifylist.xs b/src/perl/irc/Notifylist.xs
index 1951c125..33f8a9ac 100644
--- a/src/perl/irc/Notifylist.xs
+++ b/src/perl/irc/Notifylist.xs
@@ -1,4 +1,7 @@
-MODULE = Irssi::Irc PACKAGE = Irssi::Irc
+#include "module.h"
+
+MODULE = Irssi::Irc::Notifylist PACKAGE = Irssi::Irc
+PROTOTYPES: ENABLE
void
notifies()
@@ -31,7 +34,7 @@ notifylist_find(mask, ircnet)
char *ircnet
#*******************************
-MODULE = Irssi::Irc PACKAGE = Irssi::Irc::Server
+MODULE = Irssi::Irc::Notifylist PACKAGE = Irssi::Irc::Server
#*******************************
int
@@ -40,7 +43,7 @@ notifylist_ison_server(server, nick)
char *nick
#*******************************
-MODULE = Irssi::Irc PACKAGE = Irssi::Irc::Notifylist PREFIX = notifylist_
+MODULE = Irssi::Irc::Notifylist PACKAGE = Irssi::Irc::Notifylist PREFIX = notifylist_
#*******************************
int
diff --git a/src/perl/irc/Query.xs b/src/perl/irc/Query.xs
new file mode 100644
index 00000000..a4f6bd03
--- /dev/null
+++ b/src/perl/irc/Query.xs
@@ -0,0 +1,10 @@
+#include "module.h"
+
+MODULE = Irssi::Irc::Query PACKAGE = Irssi::Irc::Server PREFIX = irc_
+PROTOTYPES: ENABLE
+
+Irssi::Irc::Query
+irc_query_create(server_tag, nick, automatic)
+ char *server_tag
+ char *nick
+ int automatic
diff --git a/src/perl/irc/IrcServer.xs b/src/perl/irc/Server.xs
index 1ceff0c2..44813fe6 100644
--- a/src/perl/irc/IrcServer.xs
+++ b/src/perl/irc/Server.xs
@@ -1,4 +1,7 @@
-MODULE = Irssi::Irc PACKAGE = Irssi::Irc::Server PREFIX = irc_server_
+#include "module.h"
+
+MODULE = Irssi::Irc::Server PACKAGE = Irssi::Irc::Server PREFIX = irc_server_
+PROTOTYPES: ENABLE
char *
irc_server_get_channels(server)
@@ -32,7 +35,7 @@ ctcp_send_reply(server, data)
Irssi::Irc::Server server
char *data
-MODULE = Irssi::Irc PACKAGE = Irssi::Irc::Connect PREFIX = irc_server_
+MODULE = Irssi::Irc::Server PACKAGE = Irssi::Irc::Connect PREFIX = irc_server_
Irssi::Irc::Server
irc_server_connect(conn)