From 016b42baea9d7dcd2a284f873246c06259c560dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20F=C3=A6r=C3=B8y?= Date: Sun, 4 Jan 2015 01:57:21 +0100 Subject: Add OTR support. This patch adds support for the OTR protocol to irssi. This is an import of the external irssi-otr project that we are now taking over maintership for. Major thanks to the original authors of Irssi-OTR: Uli Meis and David Goulet. Thanks to the OTR community in #OTR on OFTC, thanks to everyone who have helped testing the patches and submitted UI suggestions. --- src/fe-text/Makefile.am | 5 ++++- src/fe-text/irssi.c | 17 +++++++++++++++-- 2 files changed, 19 insertions(+), 3 deletions(-) (limited to 'src/fe-text') diff --git a/src/fe-text/Makefile.am b/src/fe-text/Makefile.am index bdd3df22..6ce8427c 100644 --- a/src/fe-text/Makefile.am +++ b/src/fe-text/Makefile.am @@ -9,7 +9,8 @@ AM_CPPFLAGS = \ irssi_DEPENDENCIES = \ @COMMON_LIBS@ \ @PERL_LINK_LIBS@ \ - @PERL_FE_LINK_LIBS@ + @PERL_FE_LINK_LIBS@ \ + @OTR_LINK_LIBS@ irssi_LDFLAGS = -export-dynamic @@ -17,6 +18,8 @@ irssi_LDADD = \ @COMMON_LIBS@ \ @PERL_LINK_LIBS@ \ @PERL_FE_LINK_LIBS@ \ + @OTR_LINK_LIBS@ \ + @OTR_LINK_FLAGS@ \ @PERL_LINK_FLAGS@ \ @PROG_LIBS@ \ @TEXTUI_LIBS@ 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 */ -- cgit v1.2.3