Ignore was moved to core.

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

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 */

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 \
+	common/Channel.xs \
-	core/Core.xs \
+	common/Core.xs \
-	core/Log.xs \
+	common/Ignore.xs \
-	core/Masks.xs \
+	common/Log.xs \
-	core/Query.xs \
+	common/Masks.xs \
-	core/Rawlog.xs \
+	common/Query.xs \
-	core/Server.xs \
+	common/Rawlog.xs \
-	core/Settings.xs \
+	common/Server.xs \
-	core/Window.xs \
+	common/Settings.xs \
-	core/Irssi.xs \
+	common/Window.xs \
-	core/Irssi.pm \
+	common/Irssi.xs \
-	core/Makefile.PL.in \
+	common/Irssi.pm \
-	core/typemap \
+	common/Makefile.PL.in \
-	core/module.h
+	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 \

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

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

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;

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

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

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;

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