zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-10 12:23:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #854 from irssi/ahf/otr

Browse source 
OTR support, take 2
This commit is contained in:
ailin-nemui 2018-03-31 13:04:35 +02:00 • committed by GitHub
commit 0c1db8f2ae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
26 changed files with 3268 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/fe-text/Makefile.am
View file

@ -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@

17
src/fe-text/irssi.c
View file

@ -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 */