projects
/
silc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 d1fc3543787e720d194b771f47aad243c0509662..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
@@
-33,7
+33,7
@@
void fe_silc_modules_init(void);
void fe_silc_modules_deinit(void);
void fe_silc_modules_init(void);
void fe_silc_modules_deinit(void);
-
void fe_
silc_init(void)
+
static void
silc_init(void)
{
theme_register(fecommon_silc_formats);
{
theme_register(fecommon_silc_formats);
@@
-42,11
+42,21
@@
void fe_silc_init(void)
fe_silc_messages_init();
fe_silc_queries_init();
fe_silcnet_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");
}
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_queries_deinit();
fe_silc_messages_deinit();
@@
-56,3
+66,8
@@
void fe_silc_deinit(void)
theme_unregister();
}
theme_unregister();
}
+
+void fe_silc_deinit(void)
+{
+ fe_common_silc_deinit();
+}