3 files changed, 12 insertions, 9 deletions
diff --git a/src/irc/notifylist/notify-ison.c b/src/irc/notifylist/notify-ison.c
index 39ccff25..604c1804 100644
--- a/src/irc/notifylist/notify-ison.c
+++ b/src/irc/notifylist/notify-ison.c
@@ -298,7 +298,7 @@ static void ison_check_parts(IRC_SERVER_REC *server)
 	}
 }
 
-static void event_ison(const char *data, IRC_SERVER_REC *server)
+static void event_ison(IRC_SERVER_REC *server, const char *data)
 {
 	MODULE_SERVER_REC *mserver;
 	char *params, *online;
diff --git a/src/irc/notifylist/notify-whois.c b/src/irc/notifylist/notify-whois.c
index f6838bb7..eb7becd2 100644
--- a/src/irc/notifylist/notify-whois.c
+++ b/src/irc/notifylist/notify-whois.c
@@ -30,7 +30,7 @@
 
 static char *last_notify_nick;
 
-static void event_whois(const char *data, IRC_SERVER_REC *server)
+static void event_whois(IRC_SERVER_REC *server, const char *data)
 {
         char *params, *nick, *user, *host, *realname;
 	NOTIFY_NICK_REC *nickrec;
@@ -68,7 +68,7 @@ static void event_whois(const char *data, IRC_SERVER_REC *server)
 	g_free(params);
 }
 
-static void event_whois_idle(const char *data, IRC_SERVER_REC *server)
+static void event_whois_idle(IRC_SERVER_REC *server, const char *data)
 {
 	NOTIFY_NICK_REC *nickrec;
 	NOTIFYLIST_REC *notify;
@@ -92,7 +92,7 @@ static void event_whois_idle(const char *data, IRC_SERVER_REC *server)
 	g_free(params);
 }
 
-static void event_whois_away(const char *data, IRC_SERVER_REC *server)
+static void event_whois_away(IRC_SERVER_REC *server, const char *data)
 {
 	NOTIFY_NICK_REC *nickrec;
 	char *params, *nick, *awaymsg;
@@ -111,7 +111,7 @@ static void event_whois_away(const char *data, IRC_SERVER_REC *server)
 }
 
 /* All WHOIS replies got, now announce all the changes at once. */
-static void event_whois_end(const char *data, IRC_SERVER_REC *server)
+static void event_whois_end(IRC_SERVER_REC *server, const char *data)
 {
 	MODULE_SERVER_REC *mserver;
 	NOTIFYLIST_REC *notify;
@@ -169,7 +169,7 @@ void notifylist_whois_init(void)
 	signal_add("notifylist event whois idle", (SIGNAL_FUNC) event_whois_idle);
 	signal_add("notifylist event whois end", (SIGNAL_FUNC) event_whois_end);
 	expando_create("D", expando_lastnotify,
-		       "notifylist event whois", EXPANDO_ARG_SERVER2, NULL);
+		       "notifylist event whois", EXPANDO_ARG_SERVER, NULL);
 }
 
 void notifylist_whois_deinit(void)
diff --git a/src/irc/notifylist/notifylist.c b/src/irc/notifylist/notifylist.c
index e8f4f829..2836d586 100644
--- a/src/irc/notifylist/notifylist.c
+++ b/src/irc/notifylist/notifylist.c
@@ -253,7 +253,8 @@ static void notifylist_idle_reset(IRC_SERVER_REC *server, const char *nick)
 	}
 }
 
-static void event_quit(const char *data, IRC_SERVER_REC *server, const char *nick)
+static void event_quit(IRC_SERVER_REC *server, const char *data,
+		       const char *nick)
 {
 	NOTIFY_NICK_REC *rec;
 
@@ -309,7 +310,8 @@ static void notifylist_check_join(IRC_SERVER_REC *server, const char *nick,
 	g_free(user);
 }
 
-static void event_privmsg(const char *data, IRC_SERVER_REC *server, const char *nick, const char *address)
+static void event_privmsg(IRC_SERVER_REC *server, const char *data,
+			  const char *nick, const char *address)
 {
 	if (nick != NULL) {
 		notifylist_check_join(server, nick, address, "", -1);
@@ -317,7 +319,8 @@ static void event_privmsg(const char *data, IRC_SERVER_REC *server, const char *
 	}
 }
 
-static void event_join(const char *data, IRC_SERVER_REC *server, const char *nick, const char *address)
+static void event_join(IRC_SERVER_REC *server, const char *data,
+		       const char *nick, const char *address)
 {
 	notifylist_check_join(server, nick, address, "", -1);
 }