Mercurial > ~mikael > mcabber > hg

diff mcabber/mcabber/otr.c @ 2251:f3bd1564fa70

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Stop html-escaping otr messages and do only strip known tags. We'd like to remove that for good, but pidgin-otr and Adium are still sending html tags.
author franky
date Fri, 19 Feb 2016 22:14:15 +0100
parents 3958793d0d03
children 223827268b2b
line wrap: on
line diff
--- a/mcabber/mcabber/otr.c	Sat Feb 13 13:48:43 2016 +0100
+++ b/mcabber/mcabber/otr.c	Fri Feb 19 22:14:15 2016 +0100
@@ -610,7 +610,7 @@
 {
   gcry_error_t err;
   char *newmessage = NULL;
-  char *htmlmsg, *rmsg;
+  char *rmsg;
   ConnContext *ctx = otr_get_context(buddy);
 
   if (!encryption_status)
@@ -633,18 +633,16 @@
                                NULL, NULL, NULL);
 #endif
   else {
-    htmlmsg = html_escape(msg);
     err = otrl_message_sending(userstate, &ops, NULL, ctx->accountname,
 #ifdef HAVE_LIBOTR3
-                               ctx->protocol, ctx->username, htmlmsg, NULL,
+                               ctx->protocol, ctx->username, msg, NULL,
                                &newmessage, NULL, NULL);
 #else
                                // INSTAG XXX
                                ctx->protocol, ctx->username, OTRL_INSTAG_BEST,
-                               htmlmsg, NULL, &newmessage, OTRL_FRAGMENT_SEND_SKIP,
+                               msg, NULL, &newmessage, OTRL_FRAGMENT_SEND_SKIP,
                                NULL, NULL, NULL);
 #endif
-    g_free(htmlmsg);
   }
 
   if (err)