summaryrefslogtreecommitdiff
path: root/src/fe-text/irssi.c
diff options
context:
space:
mode:
authorailin-nemui <ailin-nemui@users.noreply.github.com>2018-03-31 13:04:35 +0200
committerGitHub <noreply@github.com>2018-03-31 13:04:35 +0200
commit0c1db8f2aee4aa5040a16518adb71f57dc953985 (patch)
tree4c51838a1b7aa278727b9de7f3b1663120b75e62 /src/fe-text/irssi.c
parent9fa8c32b9e2f80e308d1ed780490f6d2dfd6bb05 (diff)
parent0b2f5b0a1e30932b07245c508a673eb0e9b6ab37 (diff)
downloadirssi-0c1db8f2aee4aa5040a16518adb71f57dc953985.zip
Merge pull request #854 from irssi/ahf/otr
OTR support, take 2
Diffstat (limited to 'src/fe-text/irssi.c')
-rw-r--r--src/fe-text/irssi.c17
1 files changed, 15 insertions, 2 deletions
diff --git a/src/fe-text/irssi.c b/src/fe-text/irssi.c
index f30ce4b8..728f456e 100644
--- a/src/fe-text/irssi.c
+++ b/src/fe-text/irssi.c
@@ -54,6 +54,11 @@ void fe_perl_init(void);
void fe_perl_deinit(void);
#endif
+#ifdef HAVE_STATIC_OTR
+void otr_core_init(void);
+void otr_core_deinit(void);
+#endif
+
void irc_init(void);
void irc_deinit(void);
@@ -183,6 +188,10 @@ static void textui_finish_init(void)
fe_perl_init();
#endif
+#ifdef HAVE_STATIC_OTR
+ otr_core_init();
+#endif
+
dirty_check();
fe_common_core_finish_init();
@@ -221,8 +230,12 @@ static void textui_deinit(void)
module_unload(modules->data);
#ifdef HAVE_STATIC_PERL
- perl_core_deinit();
- fe_perl_deinit();
+ perl_core_deinit();
+ fe_perl_deinit();
+#endif
+
+#ifdef HAVE_STATIC_OTR
+ otr_core_deinit();
#endif
dirty_check(); /* one last time to print any quit messages */