summaryrefslogtreecommitdiff
path: root/plugins/MirOTR/libotr/src/userstate.c
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/MirOTR/libotr/src/userstate.c')
-rw-r--r--plugins/MirOTR/libotr/src/userstate.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/plugins/MirOTR/libotr/src/userstate.c b/plugins/MirOTR/libotr/src/userstate.c
index 6de95b8e42..58f5a05578 100644
--- a/plugins/MirOTR/libotr/src/userstate.c
+++ b/plugins/MirOTR/libotr/src/userstate.c
@@ -1,6 +1,7 @@
/*
* Off-the-Record Messaging library
- * Copyright (C) 2004-2008 Ian Goldberg, Chris Alexander, Nikita Borisov
+ * Copyright (C) 2004-2012 Ian Goldberg, Rob Smits, Chris Alexander,
+ * Willy Lew, Lisa Du, Nikita Borisov
* <otr@cypherpunks.ca>
*
* This library is free software; you can redistribute it and/or
@@ -14,7 +15,7 @@
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
/* system headers */
@@ -38,14 +39,19 @@ OtrlUserState otrl_userstate_create(void)
if (!us) return NULL;
us->context_root = NULL;
us->privkey_root = NULL;
-
+ us->instag_root = NULL;
+ us->pending_root = NULL;
+ us->timer_running = 0;
return us;
}
-/* Free a OtrlUserState */
+/* Free a OtrlUserState. If you have a timer running for this userstate,
+stop it before freeing the userstate. */
void otrl_userstate_free(OtrlUserState us)
{
otrl_context_forget_all(us);
otrl_privkey_forget_all(us);
+ otrl_privkey_pending_forget_all(us);
+ otrl_instag_forget_all(us);
free(us);
}