Changeset 6ae1056

Timestamp:

2014-02-13T22:41:02Z (11 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:

• otr.c (modified) (4 diffs)

otr.c

@@ -726 +726 @@
         if(typ == OTRL_CONVERT_RECEIVING) {
                 char *msg = g_strdup(src);
+                char *buf = msg;
 
                 /* HTML decoding */
@@ -761 +762 @@
                         *dst = g_strdup_printf("%s\x03%.2d%s%s\x0F", pre,
                                 color, sep, msg);
-                        g_free(msg);
+                        g_free(buf);
                 }
         } else {
@@ -967 +968 @@
 {
         irc_user_t *u;
+        char *msg, *query = "?OTR?";
 
         u = irc_user_by_name(irc, args[1]);
@@ -980 +982 @@
         /* passing this through the filter so it goes through libotr which
          * will replace the simple query string with a proper one */
-        otr_filter_msg_out(u, "?OTR?", 0);
+        msg = otr_filter_msg_out(u, query, 0);
+
+        /* send the message */
+        if(msg) {
+                u->bu->ic->acc->prpl->buddy_msg(u->bu->ic, u->bu->handle, msg, 0);  /* XXX flags? */
+                /* XXX error message? */
+
+                if(msg != query)
+                        g_free(msg);
+        }
 }