Changeset 6ae1056


Ignore:
Timestamp:
2014-02-13T22:41:02Z (6 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
2e815e5, cce1b63
Parents:
7a80925 (diff), 820a2a7 (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:

Merging two OTR-related bugfixes from pesco.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • otr.c

    r7a80925 r6ae1056  
    726726        if(typ == OTRL_CONVERT_RECEIVING) {
    727727                char *msg = g_strdup(src);
     728                char *buf = msg;
    728729
    729730                /* HTML decoding */
     
    761762                        *dst = g_strdup_printf("%s\x03%.2d%s%s\x0F", pre,
    762763                                color, sep, msg);
    763                         g_free(msg);
     764                        g_free(buf);
    764765                }
    765766        } else {
     
    967968{
    968969        irc_user_t *u;
     970        char *msg, *query = "?OTR?";
    969971
    970972        u = irc_user_by_name(irc, args[1]);
     
    980982        /* passing this through the filter so it goes through libotr which
    981983         * will replace the simple query string with a proper one */
    982         otr_filter_msg_out(u, "?OTR?", 0);
     984        msg = otr_filter_msg_out(u, query, 0);
     985
     986        /* send the message */
     987        if(msg) {
     988                u->bu->ic->acc->prpl->buddy_msg(u->bu->ic, u->bu->handle, msg, 0);  /* XXX flags? */
     989                /* XXX error message? */
     990
     991                if(msg != query)
     992                        g_free(msg);
     993        }
    983994}
    984995
Note: See TracChangeset for help on using the changeset viewer.