From dc9797f7ad4177dc72373ce71d375257fb0271a1 Mon Sep 17 00:00:00 2001 From: Sven Moritz Hallberg Date: Sat, 16 Feb 2008 14:24:44 +0100 Subject: keep track of which keys are queued for generation --- irc.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'irc.c') diff --git a/irc.c b/irc.c index 469789e7..d73f5b4a 100644 --- a/irc.c +++ b/irc.c @@ -133,11 +133,7 @@ irc_t *irc_new( int fd ) conf_loaddefaults( irc ); - irc->otr_us = otrl_userstate_create(); - irc->otr_keygen = 0; - irc->otr_to = NULL; - irc->otr_from = NULL; - irc->otr_ntodo = 0; + irc->otr = otr_new(); return( irc ); } @@ -289,12 +285,7 @@ void irc_free(irc_t * irc) } } - otrl_userstate_free(irc->otr_us); - if(irc->otr_keygen) { - kill(irc->otr_keygen, SIGTERM); - waitpid(irc->otr_keygen, NULL, 0); - /* TODO: remove stale keygen tempfiles */ - } + otr_free(irc->otr); g_free(irc); -- cgit v1.2.3