updated

diff --git a/CHANGES b/CHANGES
index cadef5a546410ac28167d73bc5322eb5f3407d6b..88e5b1a2e4446a921ba347c408a0d9ba70f006c6 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -3,7 +3,7 @@ Mon Feb 18 15:49:22 EET 2002  Timo Sirainen <tss@iki.fi>
        * Added proper initializations to silc's irssi code, so it's
          now possible to load it as module.  Affected files
          irssi/src/silc/core/silc-core.c,
-         fe-common/silc/fe-common-silc-core.c and fe-text/silc.c
+         fe-common/silc/fe-common-silc-core.[ch] and fe-text/silc.c
 
 Sun Feb 17 19:02:56 EET 2002  Pekka Riikonen <priikone@silcnet.org>
 

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 0d7b8cc7690d04431d44f43c854f68c5c75898ae..e1912d5c91b2d0272aa8d6e2fb017094ee8b2c04 100644 (file)
--- a/apps/irssi/src/fe-common/silc/fe-common-silc.c
+++ b/apps/irssi/src/fe-common/silc/fe-common-silc.c
@@ -20,6 +20,7 @@
 
 #include "module.h"
 #include "module-formats.h"
+#include "modules.h"
 #include "signals.h"
 #include "themes.h"
 
@@ -29,22 +30,20 @@ void fe_silc_channels_deinit(void);
 void fe_silc_modules_init(void);
 void fe_silc_modules_deinit(void);
 
-void fe_common_silc_init(void)
+void fe_silc_init(void)
 {
   theme_register(fecommon_silc_formats);
 
   fe_silc_channels_init();
   fe_silc_modules_init();
+
+  module_register("silc", "fe");
 }
 
-void fe_common_silc_deinit(void)
+void fe_silc_deinit(void)
 {
   fe_silc_modules_deinit();
   fe_silc_channels_deinit();
 
   theme_unregister();
 }
-
-void fe_common_silc_finish_init(void)
-{
-}

diff --git a/apps/irssi/src/fe-common/silc/fe-common-silc.h b/apps/irssi/src/fe-common/silc/fe-common-silc.h
index 4a9a64834aa3e275a2b5289569fe7d96bbc336de..ad9b01c30c4dd9a8de9cbea11e0a7ac903009730 100644 (file)
--- a/apps/irssi/src/fe-common/silc/fe-common-silc.h
+++ b/apps/irssi/src/fe-common/silc/fe-common-silc.h
@@ -1,8 +1,7 @@
 #ifndef __FE_COMMON_SILC_H
 #define __FE_COMMON_SILC_H
 
-void fe_common_silc_init(void);
-void fe_common_silc_deinit(void);
-void fe_common_silc_finish_init(void);
+void fe_silc_init(void);
+void fe_silc_deinit(void);
 
 #endif

diff --git a/apps/irssi/src/fe-text/silc.c b/apps/irssi/src/fe-text/silc.c
index 17a77967fda0ce6d0af67ab07633e4f4efa76377..fa7a247a84707f9b2d0ffd0912bc0cbecccbc5b3 100644 (file)
--- a/apps/irssi/src/fe-text/silc.c
+++ b/apps/irssi/src/fe-text/silc.c
@@ -147,7 +147,7 @@ static void textui_init(void)
        core_init();
        silc_init();
        fe_common_core_init();
-       fe_common_silc_init();
+       fe_silc_init();
 
        theme_register(gui_text_formats);
        signal_add_last("gui exit", (SIGNAL_FUNC) sig_exit);
@@ -237,7 +237,7 @@ static void textui_deinit(void)
 
        theme_unregister();
 
-       fe_common_silc_deinit();
+       fe_silc_deinit();
        fe_common_core_deinit();
        silc_deinit();
        core_deinit();

diff --git a/apps/irssi/src/silc/core/silc-core.c b/apps/irssi/src/silc/core/silc-core.c
index 0205ca40d2a5e3a5eb96bf744b33671880580ae0..a0850fd386246e96f422e857c773af2859686ea4 100644 (file)
--- a/apps/irssi/src/silc/core/silc-core.c
+++ b/apps/irssi/src/silc/core/silc-core.c
@@ -425,6 +425,8 @@ void silc_core_init(void)
   silc_queries_init();
 
   idletag = g_timeout_add(5, (GSourceFunc) my_silc_scheduler, NULL);
+
+  module_register("silc", "core");
 }
 
 /* Deinit SILC. Called from src/fe-text/silc.c */