diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/ignore.h | 2 | ||||
| -rw-r--r-- | src/perl/Makefile.am | 30 | ||||
| -rw-r--r-- | src/perl/common/Ignore.xs (renamed from src/perl/irc/Ignore.xs) | 16 | ||||
| -rw-r--r-- | src/perl/common/Irssi.xs | 1 | ||||
| -rw-r--r-- | src/perl/common/module.h | 2 | ||||
| -rw-r--r-- | src/perl/common/typemap | 1 | ||||
| -rw-r--r-- | src/perl/irc/Irc.xs | 1 | ||||
| -rw-r--r-- | src/perl/irc/module.h | 2 | ||||
| -rw-r--r-- | src/perl/irc/typemap | 1 |
9 files changed, 29 insertions, 27 deletions
diff --git a/src/core/ignore.h b/src/core/ignore.h index e4355f52..c52e09ba 100644 --- a/src/core/ignore.h +++ b/src/core/ignore.h @@ -1,6 +1,8 @@ #ifndef __IGNORE_H #define __IGNORE_H +#include "servers.h" + typedef struct { char *mask; /* nick mask */ char *servertag; /* this is for autoignoring */ diff --git a/src/perl/Makefile.am b/src/perl/Makefile.am index 8e2d2df4..44f8d13a 100644 --- a/src/perl/Makefile.am +++ b/src/perl/Makefile.am @@ -42,26 +42,26 @@ perl-signals.h: $(top_srcdir)/docs/signals.txt $(srcdir)/get-signals.pl cat $(top_srcdir)/docs/signals.txt | $(perlpath) $(srcdir)/get-signals.pl > perl-signals.h CORE_SOURCES = \ - core/Channel.xs \ - core/Core.xs \ - core/Log.xs \ - core/Masks.xs \ - core/Query.xs \ - core/Rawlog.xs \ - core/Server.xs \ - core/Settings.xs \ - core/Window.xs \ - core/Irssi.xs \ - core/Irssi.pm \ - core/Makefile.PL.in \ - core/typemap \ - core/module.h + common/Channel.xs \ + common/Core.xs \ + common/Ignore.xs \ + common/Log.xs \ + common/Masks.xs \ + common/Query.xs \ + common/Rawlog.xs \ + common/Server.xs \ + common/Settings.xs \ + common/Window.xs \ + common/Irssi.xs \ + common/Irssi.pm \ + common/Makefile.PL.in \ + common/typemap \ + common/module.h IRC_SOURCES = \ irc/Bans.xs \ irc/Dcc.xs \ irc/Flood.xs \ - irc/Ignore.xs \ irc/IrcChannel.xs \ irc/IrcQuery.xs \ irc/IrcServer.xs \ diff --git a/src/perl/irc/Ignore.xs b/src/perl/common/Ignore.xs index c19eb5c8..643198f3 100644 --- a/src/perl/irc/Ignore.xs +++ b/src/perl/common/Ignore.xs @@ -1,4 +1,4 @@ -MODULE = Irssi::Irc PACKAGE = Irssi::Irc +MODULE = Irssi PACKAGE = Irssi void ignores() @@ -6,7 +6,7 @@ PREINIT: GSList *tmp; HV *stash; PPCODE: - stash = gv_stashpv("Irssi::Irc::Ignore", 0); + stash = gv_stashpv("Irssi::Ignore", 0); for (tmp = servers; tmp != NULL; tmp = tmp->next) { XPUSHs(sv_2mortal(sv_bless(newRV_noinc(newSViv(GPOINTER_TO_INT(tmp->data))), stash))); } @@ -24,12 +24,12 @@ OUTPUT: RETVAL #******************************* -MODULE = Irssi::Irc PACKAGE = Irssi::Irc::Server +MODULE = Irssi PACKAGE = Irssi::Server #******************************* int ignore_check(server, nick, host, channel, text, level) - Irssi::Irc::Server server + Irssi::Server server char *nick char *host char *channel @@ -37,12 +37,12 @@ ignore_check(server, nick, host, channel, text, level) int level #******************************* -MODULE = Irssi::Irc PACKAGE = Irssi::Irc::Ignore PREFIX = ignore_ +MODULE = Irssi PACKAGE = Irssi::Ignore PREFIX = ignore_ #******************************* void values(ignore) - Irssi::Irc::Ignore ignore + Irssi::Ignore ignore PREINIT: HV *hv; AV *av; @@ -67,8 +67,8 @@ PPCODE: void ignore_add_rec(rec) - Irssi::Irc::Ignore rec + Irssi::Ignore rec void ignore_update_rec(rec) - Irssi::Irc::Ignore rec + Irssi::Ignore rec diff --git a/src/perl/common/Irssi.xs b/src/perl/common/Irssi.xs index c996b6e2..53e5196e 100644 --- a/src/perl/common/Irssi.xs +++ b/src/perl/common/Irssi.xs @@ -7,6 +7,7 @@ PROTOTYPES: ENABLE INCLUDE: Channel.xs INCLUDE: Core.xs +INCLUDE: Ignore.xs INCLUDE: Log.xs INCLUDE: Masks.xs INCLUDE: Query.xs diff --git a/src/perl/common/module.h b/src/perl/common/module.h index 4d33a474..a47728e6 100644 --- a/src/perl/common/module.h +++ b/src/perl/common/module.h @@ -8,6 +8,7 @@ #include "commands.h" #include "log.h" #include "rawlog.h" +#include "ignore.h" #include "settings.h" #include "masks.h" @@ -25,6 +26,7 @@ typedef COMMAND_REC *Irssi__Command; typedef LOG_REC *Irssi__Log; typedef RAWLOG_REC *Irssi__Rawlog; +typedef IGNORE_REC *Irssi__Ignore; typedef SERVER_REC *Irssi__Server; typedef SERVER_CONNECT_REC *Irssi__Connect; diff --git a/src/perl/common/typemap b/src/perl/common/typemap index 5490ce42..c7de4903 100644 --- a/src/perl/common/typemap +++ b/src/perl/common/typemap @@ -6,6 +6,7 @@ Irssi::Channel T_PTROBJ Irssi::Query T_PTROBJ Irssi::Command T_PTROBJ Irssi::Nick T_PTROBJ +Irssi::Ignore T_PTROBJ Irssi::Log T_PTROBJ Irssi::Rawlog T_PTROBJ Irssi::Window T_PTROBJ diff --git a/src/perl/irc/Irc.xs b/src/perl/irc/Irc.xs index 0d00e9ce..f70e9a22 100644 --- a/src/perl/irc/Irc.xs +++ b/src/perl/irc/Irc.xs @@ -5,7 +5,6 @@ MODULE = Irssi::Irc PACKAGE = Irssi::Irc PROTOTYPES: ENABLE INCLUDE: Bans.xs -INCLUDE: Ignore.xs INCLUDE: IrcServer.xs INCLUDE: IrcChannel.xs INCLUDE: IrcQuery.xs diff --git a/src/perl/irc/module.h b/src/perl/irc/module.h index 2e0e7823..2c2f24c7 100644 --- a/src/perl/irc/module.h +++ b/src/perl/irc/module.h @@ -8,7 +8,6 @@ #include "modes.h" #include "mode-lists.h" #include "netsplit.h" -#include "ignore.h" #include "dcc/dcc.h" #include "flood/autoignore.h" @@ -25,4 +24,3 @@ typedef NETSPLIT_REC *Irssi__Irc__Netsplit; typedef NETSPLIT_SERVER_REC *Irssi__Irc__Netsplitserver; typedef AUTOIGNORE_REC *Irssi__Irc__Autoignore; typedef NOTIFYLIST_REC *Irssi__Irc__Notifylist; -typedef IGNORE_REC *Irssi__Irc__Ignore; diff --git a/src/perl/irc/typemap b/src/perl/irc/typemap index 58a8ce95..88035c57 100644 --- a/src/perl/irc/typemap +++ b/src/perl/irc/typemap @@ -9,6 +9,5 @@ Irssi::Irc::Netsplit T_PTROBJ Irssi::Irc::Netsplitserver T_PTROBJ Irssi::Irc::Autoignore T_PTROBJ Irssi::Irc::Notifylist T_PTROBJ -Irssi::Irc::Ignore T_PTROBJ Irssi::Nick T_PTROBJ |