Changeset cc17b76


Ignore:
Timestamp:
2014-01-20T22:00:53Z (6 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
367ea3c, 71004a3
Parents:
4dda9e4
Message:

Merging fix from Flexo for #1109.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • otr.c

    r4dda9e4 rcc17b76  
    454454        st = otrl_message_sending(irc->otr->us, &otr_ops, ic,
    455455                ic->acc->user, ic->acc->prpl->name, iu->bu->handle, instag,
    456                 emsg, NULL, &otrmsg, OTRL_FRAGMENT_SEND_ALL, &ctx, NULL, NULL);
     456                emsg, NULL, &otrmsg, OTRL_FRAGMENT_SEND_SKIP, &ctx, NULL, NULL);
    457457        /* in libotr 4.0.0 with OTRL_FRAGMENT_SEND_ALL, otrmsg must be passed
    458458         * but the value it gets carries no meaning. it can be set even though
    459          * the message has been injected. */
     459         * the message has been injected.
     460         * With OTRL_FRAGMENT_SEND_SKIP, libotr doesn't handle the sending, it's
     461         * up to us.
     462         */
    460463
    461464        if(emsg != msg) {
    462465                g_free(emsg);   /* we're done with this one */
     466                emsg = NULL;
    463467        }
    464468        if(st) {
    465                 /* TODO: Error reporting? */
    466         }
    467        
    468         return NULL;
     469                irc_rootmsg(irc, "Error encrypting text for OTR: %d", st);
     470        }
     471       
     472        if (otrmsg != NULL) {
     473                return otrmsg;
     474        }
     475        return emsg;
    469476}
    470477
Note: See TracChangeset for help on using the changeset viewer.