Changeset 434a2d0 for otr.h

Timestamp:

2013-12-05T09:20:22Z (10 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

a8aa823

Parents:

943bda7 (diff), e73e165 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Exchange libotr 2.x compatibility for libotr 3.x compatibility, because that's
how annoying the libotr authors apparently want to be.

File:

• otr.h (modified) (2 diffs)

otr.h

@@ -8 +8 @@
   OTR support (cf. http://www.cypherpunks.ca/otr/)
   
-  2008, Sven Moritz Hallberg <pesco@khjk.org>
-  (c) and funded by stonedcoder.org
+  (c) 2008,2013 Sven Moritz Hallberg <pesco@khjk.org>
+  funded by stonedcoder.org
 */
 
@@ -66 +66 @@
         /* keygen jobs waiting to be sent to slave */
         kg_t *todo;
+
+        /* event timer for otrl_message_poll */
+        gint timer;
 } otr_t;