Merged silc_1_1_branch to trunk.

[silc.git] / apps / irssi / src / fe-common / silc / fe-common-silc.c

diff --git a/apps/irssi/src/fe-common/silc/fe-common-silc.c b/apps/irssi/src/fe-common/silc/fe-common-silc.c
index 51047a005396ddf52936115d787c034e88d34a7f..ee45c2e3904d9a312cd77ce57cf5933754e9452c 100644 (file)
--- a/apps/irssi/src/fe-common/silc/fe-common-silc.c
+++ b/apps/irssi/src/fe-common/silc/fe-common-silc.c
@@ -24,31 +24,50 @@
 #include "signals.h"
 #include "themes.h"
 
-void fe_silc_channels_init(void);
-void fe_silc_channels_deinit(void);
+#include "fe-silcnet.h"
+#include "fe-silc-messages.h"
+#include "fe-silc-queries.h"
+#include "fe-silc-channels.h"
+
 
 void fe_silc_modules_init(void);
 void fe_silc_modules_deinit(void);
 
-void fe_silc_messages_init(void);
-void fe_silc_messages_deinit(void);
-
-void fe_silc_init(void)
+static void silc_init(void)
 {
   theme_register(fecommon_silc_formats);
 
   fe_silc_channels_init();
   fe_silc_modules_init();
   fe_silc_messages_init();
+  fe_silc_queries_init();
+  fe_silcnet_init();
+}
+
+void fe_common_silc_init(void)
+{
+  silc_init();
+  module_register("silc", "fe_common");
+}
 
+void fe_silc_init(void)
+{
+  silc_init();
   module_register("silc", "fe");
 }
 
-void fe_silc_deinit(void)
+void fe_common_silc_deinit(void)
 {
+  fe_silc_queries_deinit();
   fe_silc_messages_deinit();
   fe_silc_modules_deinit();
   fe_silc_channels_deinit();
+  fe_silcnet_deinit();
 
   theme_unregister();
 }
+
+void fe_silc_deinit(void)
+{
+  fe_common_silc_deinit();
+}