Changeset c347a12

Timestamp:

2013-08-02T20:55:16Z (11 years ago)

Author:

unknown <pesco@…>

Branches:

master

Children:

fbcb481

Parents:

f93e01c

Message:

timer cleanup and "other instance" error message

Files:

• otr.c (modified) (4 diffs)
• otr.h (modified) (1 diff)

otr.c

@@ -271 +271 @@
         /* regularly call otrl_message_poll */
         gint definterval = otrl_message_poll_get_default_interval(irc->otr->us);
-        b_timeout_add(definterval, ev_message_poll, irc->otr);
+        irc->otr->timer = b_timeout_add(definterval, ev_message_poll, irc->otr);
 
         return TRUE;
@@ -279 +279 @@
 {
         otr_t *otr = irc->otr;
+        b_event_remove(otr->timer);
         otrl_userstate_free(otr->us);
         if(otr->keygen) {
@@ -845 +846 @@
                 display_otr_message(opdata, ctx,
                         "unreadable encrypted message received");
+                break;
+        case OTRL_MSGEVENT_RCVDMSG_FOR_OTHER_INSTANCE:
+                display_otr_message(opdata, ctx,
+                        "OTR message for a different instance received");
                 break;
         case OTRL_MSGEVENT_RCVDMSG_MALFORMED:
@@ -1355 +1360 @@
         otr_t *otr = data;
 
-        otrl_message_poll(otr->us, &otr_ops, NULL);
+        if(otr && otr->us)
+                otrl_message_poll(otr->us, &otr_ops, NULL);
 
         return TRUE;    /* cycle timer */

otr.h

@@ -66 +66 @@
         /* keygen jobs waiting to be sent to slave */
         kg_t *todo;
+
+        /* event timer for otrl_message_poll */
+        gint timer;
 } otr_t;