Lots of moving stuff around - hopefully I didn't break too much :)

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

5 files changed, 20 insertions, 20 deletions

diff --git a/src/irc/notifylist/module.h b/src/irc/notifylist/module.h
index 43110540..ec67bcbb 100644
--- a/src/irc/notifylist/module.h
+++ b/src/irc/notifylist/module.h
@@ -25,7 +25,7 @@ typedef struct {
 	GSList *ison_tempusers; /* Temporary list for saving /ISON events.. */
 } MODULE_SERVER_REC;
 
-#include "irc-server.h"
+#include "irc-servers.h"
 
 NOTIFY_NICK_REC *notify_nick_create(IRC_SERVER_REC *server, const char *nick);
 void notify_nick_destroy(NOTIFY_NICK_REC *rec);
diff --git a/src/irc/notifylist/notify-ison.c b/src/irc/notifylist/notify-ison.c
index b03f9a2e..c3b459b2 100644
--- a/src/irc/notifylist/notify-ison.c
+++ b/src/irc/notifylist/notify-ison.c
@@ -24,8 +24,8 @@
 #include "settings.h"
 
 #include "irc.h"
-#include "irc-server.h"
-#include "server-redirect.h"
+#include "irc-servers.h"
+#include "servers-redirect.h"
 
 #include "notifylist.h"
 
@@ -127,7 +127,7 @@ static void notifylist_timeout_server(IRC_SERVER_REC *server)
 	for (tmp = notifies; tmp != NULL; tmp = tmp->next) {
 		NOTIFYLIST_REC *rec = tmp->data;
 
-		if (!notifylist_ircnets_match(rec, server->connrec->ircnet))
+		if (!notifylist_ircnets_match(rec, server->connrec->chatnet))
                         continue;
 
 		nick = g_strdup(rec->mask);
@@ -251,7 +251,7 @@ static void ison_check_joins(IRC_SERVER_REC *server)
 	for (tmp = mserver->ison_tempusers; tmp != NULL; tmp = tmp->next) {
 		char *nick = tmp->data;
 
-		notify = notifylist_find(nick, server->connrec->ircnet);
+		notify = notifylist_find(nick, server->connrec->chatnet);
 		send_whois = notify != NULL &&
 			(notify->away_check || notify->idle_check_time > 0);
 
diff --git a/src/irc/notifylist/notify-setup.c b/src/irc/notifylist/notify-setup.c
index df1dc541..aba7742a 100644
--- a/src/irc/notifylist/notify-setup.c
+++ b/src/irc/notifylist/notify-setup.c
@@ -22,7 +22,7 @@
 #include "lib-config/iconfig.h"
 #include "settings.h"
 
-#include "irc-server.h"
+#include "irc-servers.h"
 #include "notifylist.h"
 
 void notifylist_add_config(NOTIFYLIST_REC *rec)
diff --git a/src/irc/notifylist/notify-whois.c b/src/irc/notifylist/notify-whois.c
index 5a9500cc..45ec8479 100644
--- a/src/irc/notifylist/notify-whois.c
+++ b/src/irc/notifylist/notify-whois.c
@@ -23,7 +23,7 @@
 #include "special-vars.h"
 
 #include "irc.h"
-#include "irc-server.h"
+#include "irc-servers.h"
 #include "masks.h"
 
 #include "notifylist.h"
@@ -41,8 +41,8 @@ static void event_whois(const char *data, IRC_SERVER_REC *server)
 
 	params = event_get_params(data, 6, NULL, &nick, &user, &host, NULL, &realname);
 
-	notify = notifylist_find(nick, server->connrec->ircnet);
-	if (notify != NULL && !irc_mask_match(notify->mask, nick, user, host)) {
+	notify = notifylist_find(nick, server->connrec->chatnet);
+	if (notify != NULL && !mask_match(SERVER(server), notify->mask, nick, user, host)) {
 		/* user or host didn't match */
 		g_free(params);
 		return;
@@ -80,7 +80,7 @@ static void event_whois_idle(const char *data, IRC_SERVER_REC *server)
 	params = event_get_params(data, 3, NULL, &nick, &secstr);
 	secs = atol(secstr);
 
-	notify = notifylist_find(nick, server->connrec->ircnet);
+	notify = notifylist_find(nick, server->connrec->chatnet);
 	nickrec = notify_nick_find(server, nick);
 	if (notify != NULL && nickrec != NULL) {
 		nickrec->idle_changed = secs < nickrec->idle_time &&
@@ -127,7 +127,7 @@ static void event_whois_end(const char *data, IRC_SERVER_REC *server)
 		if (rec->realname == NULL)
 			continue;
 
-		notify = notifylist_find(rec->nick, server->connrec->ircnet);
+		notify = notifylist_find(rec->nick, server->connrec->chatnet);
 		if (notify == NULL) continue;
 
 		away_ok = !notify->away_check || !rec->away;
@@ -155,7 +155,7 @@ static void event_whois_end(const char *data, IRC_SERVER_REC *server)
 }
 
 /* last person that NOTIFY detected a signon for */
-static char *expando_lastnotify(void *server, void *item, int *free_ret)
+static char *expando_lastnotify(SERVER_REC *server, void *item, int *free_ret)
 {
 	return last_notify_nick;
 }
diff --git a/src/irc/notifylist/notifylist.c b/src/irc/notifylist/notifylist.c
index de19ed0c..f16cf16c 100644
--- a/src/irc/notifylist/notifylist.c
+++ b/src/irc/notifylist/notifylist.c
@@ -23,8 +23,8 @@
 #include "signals.h"
 
 #include "irc.h"
-#include "irc-server.h"
-#include "server-redirect.h"
+#include "irc-channels.h"
+#include "servers-redirect.h"
 #include "masks.h"
 #include "nicklist.h"
 
@@ -149,7 +149,7 @@ static IRC_SERVER_REC *notifylist_ison_serverlist(const char *nick, const char *
 
 	server = NULL;
 	for (tmp = list; *tmp != NULL; tmp++) {
-		server = (IRC_SERVER_REC *) server_find_ircnet(*tmp);
+		server = (IRC_SERVER_REC *) server_find_chatnet(*tmp);
 
 		if (server != NULL && notifylist_ison_server(server, nick))
 			break;
@@ -227,7 +227,7 @@ static void notifylist_idle_reset(IRC_SERVER_REC *server, const char *nick)
 	NOTIFY_NICK_REC *rec;
 	NOTIFYLIST_REC *notify;
 
-	notify = notifylist_find(nick, server->connrec->ircnet);
+	notify = notifylist_find(nick, server->connrec->chatnet);
 	rec = notify_nick_find(server, nick);
 
 	if (notify != NULL && rec != NULL && notify->idle_check_time > 0 &&
@@ -257,7 +257,7 @@ static void notifylist_check_join(IRC_SERVER_REC *server, const char *nick,
 	NOTIFY_NICK_REC *rec;
 	char *user, *host;
 
-	notify = notifylist_find(nick, server->connrec->ircnet);
+	notify = notifylist_find(nick, server->connrec->chatnet);
 	if (notify == NULL) return;
 
 	rec = notify_nick_find(server, nick);
@@ -268,7 +268,7 @@ static void notifylist_check_join(IRC_SERVER_REC *server, const char *nick,
 	host = strchr(user, '@');
 	if (host != NULL) *host++ = '\0'; else host = "";
 
-	if (!irc_mask_match(notify->mask, nick, user, host)) {
+	if (!mask_match(SERVER(server), notify->mask, nick, user, host)) {
 		g_free(user);
 		return;
 	}
@@ -309,11 +309,11 @@ static void event_join(const char *data, IRC_SERVER_REC *server, const char *nic
 	notifylist_check_join(server, nick, address, "", -1);
 }
 
-static void sig_channel_wholist(CHANNEL_REC *channel)
+static void sig_channel_wholist(IRC_CHANNEL_REC *channel)
 {
 	GSList *nicks, *tmp;
 
-	nicks = nicklist_getnicks(channel);
+	nicks = nicklist_getnicks(CHANNEL(channel));
 	for (tmp = nicks; tmp != NULL; tmp = tmp->next) {
 		NICK_REC *rec = tmp->data;