5 files changed, 14 insertions, 21 deletions

diff --git a/src/fe-common/irc/Makefile.am b/src/fe-common/irc/Makefile.am
index d4ca3f70..662caf9d 100644
--- a/src/fe-common/irc/Makefile.am
+++ b/src/fe-common/irc/Makefile.am
@@ -25,6 +25,7 @@ libfe_common_irc_la_SOURCES = \
 	fe-common-irc.c \
 	irc-window-activity.c \
 	irc-hilight-text.c \
+        irc-modules.c \
 	module-formats.c 
 
 noinst_HEADERS = \
diff --git a/src/fe-common/irc/dcc/fe-dcc.c b/src/fe-common/irc/dcc/fe-dcc.c
index 5cdcd28d..1ca4b167 100644
--- a/src/fe-common/irc/dcc/fe-dcc.c
+++ b/src/fe-common/irc/dcc/fe-dcc.c
@@ -403,7 +403,7 @@ static void dcc_chat_closed(WINDOW_REC *window, WI_IRC_REC *item)
 	}
 }
 
-void fe_dcc_init(void)
+void fe_irc_dcc_init(void)
 {
     signal_add("dcc connected", (SIGNAL_FUNC) dcc_connected);
     signal_add("dcc rejected", (SIGNAL_FUNC) dcc_rejected);
@@ -432,7 +432,7 @@ void fe_dcc_init(void)
     theme_register(fecommon_irc_dcc_formats);
 }
 
-void fe_dcc_deinit(void)
+void fe_irc_dcc_deinit(void)
 {
     theme_unregister();
 
diff --git a/src/fe-common/irc/fe-common-irc.c b/src/fe-common/irc/fe-common-irc.c
index 87a0655e..63430a69 100644
--- a/src/fe-common/irc/fe-common-irc.c
+++ b/src/fe-common/irc/fe-common-irc.c
@@ -31,6 +31,9 @@
 #include "themes.h"
 #include "completion.h"
 
+void fe_irc_modules_init(void);
+void fe_irc_modules_deinit(void);
+
 void fe_channels_init(void);
 void fe_channels_deinit(void);
 
@@ -43,9 +46,6 @@ void fe_irc_server_deinit(void);
 void fe_ctcp_init(void);
 void fe_ctcp_deinit(void);
 
-void fe_dcc_init(void);
-void fe_dcc_deinit(void);
-
 void fe_events_init(void);
 void fe_events_deinit(void);
 
@@ -61,12 +61,6 @@ void fe_query_deinit(void);
 void irc_window_activity_init(void);
 void irc_window_activity_deinit(void);
 
-void fe_notifylist_init(void);
-void fe_notifylist_deinit(void);
-
-void fe_flood_init(void);
-void fe_flood_deinit(void);
-
 void fe_netsplit_init(void);
 void fe_netsplit_deinit(void);
 
@@ -108,30 +102,28 @@ void fe_common_irc_init(void)
 	fe_irc_commands_init();
 	fe_irc_server_init();
 	fe_ctcp_init();
-	fe_dcc_init();
 	fe_events_init();
 	fe_events_numeric_init();
 	fe_ignore_init();
-	fe_notifylist_init();
-	fe_flood_init();
 	fe_netsplit_init();
 	fe_query_init();
 	completion_init();
 	irc_window_activity_init();
+
+	fe_irc_modules_init();
 }
 
 void fe_common_irc_deinit(void)
 {
+	fe_irc_modules_deinit();
+
 	fe_channels_deinit();
 	fe_irc_commands_deinit();
 	fe_irc_server_deinit();
 	fe_ctcp_deinit();
-	fe_dcc_deinit();
 	fe_events_deinit();
 	fe_events_numeric_deinit();
 	fe_ignore_deinit();
-	fe_notifylist_deinit();
-	fe_flood_deinit();
 	fe_netsplit_deinit();
 	fe_query_deinit();
 	completion_deinit();
diff --git a/src/fe-common/irc/flood/fe-flood.c b/src/fe-common/irc/flood/fe-flood.c
index b7937fe9..eca1a3b3 100644
--- a/src/fe-common/irc/flood/fe-flood.c
+++ b/src/fe-common/irc/flood/fe-flood.c
@@ -43,7 +43,7 @@ static void event_autoignore_remove(IRC_SERVER_REC *server, AUTOIGNORE_REC *igno
 	printformat(server, NULL, MSGLEVEL_CLIENTNOTICE, IRCTXT_AUTOUNIGNORE, ignore->nick);
 }
 
-void fe_flood_init(void)
+void fe_irc_flood_init(void)
 {
 	signal_add("autoignore new", (SIGNAL_FUNC) event_autoignore_new);
 	signal_add("autoignore remove", (SIGNAL_FUNC) event_autoignore_remove);
@@ -51,7 +51,7 @@ void fe_flood_init(void)
         theme_register(fecommon_irc_flood_formats);
 }
 
-void fe_flood_deinit(void)
+void fe_irc_flood_deinit(void)
 {
 	theme_unregister();
 
diff --git a/src/fe-common/irc/notifylist/fe-notifylist.c b/src/fe-common/irc/notifylist/fe-notifylist.c
index 3a799de3..77a25fe0 100644
--- a/src/fe-common/irc/notifylist/fe-notifylist.c
+++ b/src/fe-common/irc/notifylist/fe-notifylist.c
@@ -224,7 +224,7 @@ static void notifylist_unidle(IRC_SERVER_REC *server, const char *nick,
 		    server->connrec->ircnet == NULL ? "IRC" : server->connrec->ircnet);
 }
 
-void fe_notifylist_init(void)
+void fe_irc_notifylist_init(void)
 {
 	theme_register(fecommon_irc_notifylist_formats);
 
@@ -235,7 +235,7 @@ void fe_notifylist_init(void)
 	signal_add("notifylist unidle", (SIGNAL_FUNC) notifylist_unidle);
 }
 
-void fe_notifylist_deinit(void)
+void fe_irc_notifylist_deinit(void)
 {
 	theme_unregister();