Changeset b939cff

Timestamp:

2013-08-02T10:48:03Z (11 years ago)

Author:

unknown <pesco@…>

Branches:

master

Children:

6d9f0ba

Parents:

090c9b7

Message:

work around libotr bugs

File:

• otr.c (modified) (2 diffs)

otr.c

@@ -435 +435 @@
                 ic->acc->user, ic->acc->prpl->name, iu->bu->handle, instag,
                 emsg, NULL, &otrmsg, OTRL_FRAGMENT_SEND_ALL, &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. */
 
         if(emsg != msg) {
                 g_free(emsg);   /* we're done with this one */
-        }
-        if(otrmsg) {
-                /* Is this ever reached!? */
-                ic->acc->prpl->buddy_msg(ic, iu->bu->handle, otrmsg, 0);
         }
         if(st) {
@@ -656 +655 @@
 int op_max_message_size(void *opdata, ConnContext *context)
 {
+        /* libotr 4.0.0 has a bug where it doesn't set opdata */
+        if(!opdata) {
+                /* crude fallback */
+                return 800;
+        }
+
         struct im_connection *ic =
                 check_imc(opdata, context->accountname, context->protocol);
-
+ 
         return ic->acc->prpl->mms;
 }