Changeset cc17b76

Timestamp:

2014-01-20T22:00:53Z (11 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

367ea3c, 71004a3

Parents:

4dda9e4

Message:

Merging fix from Flexo for #1109.

File:

• otr.c (modified) (1 diff)

otr.c

@@ -454 +454 @@
         st = otrl_message_sending(irc->otr->us, &otr_ops, ic,
                 ic->acc->user, ic->acc->prpl->name, iu->bu->handle, instag,
-                emsg, NULL, &otrmsg, OTRL_FRAGMENT_SEND_ALL, &ctx, NULL, NULL);
+                emsg, NULL, &otrmsg, OTRL_FRAGMENT_SEND_SKIP, &ctx, NULL, NULL);
         /* in libotr 4.0.0 with OTRL_FRAGMENT_SEND_ALL, otrmsg must be passed
          * but the value it gets carries no meaning. it can be set even though
-         * the message has been injected. */
+         * the message has been injected.
+         * With OTRL_FRAGMENT_SEND_SKIP, libotr doesn't handle the sending, it's
+         * up to us.
+         */
 
         if(emsg != msg) {
                 g_free(emsg);   /* we're done with this one */
+                emsg = NULL;
         }
         if(st) {
-                /* TODO: Error reporting? */
-        }
-        
-        return NULL;
+                irc_rootmsg(irc, "Error encrypting text for OTR: %d", st);
+        }
+        
+        if (otrmsg != NULL) {
+                return otrmsg;
+        }
+        return emsg;
 }