changeset 1580:c8be6c2243d6

Only html escape messages when otr session is established
author franky
date Tue, 14 Apr 2009 20:36:08 +0200
parents a2dd83167bc9
children b29ac1f171ea
files mcabber/src/otr.c
diffstat 1 files changed, 11 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/mcabber/src/otr.c	Mon Apr 13 22:48:48 2009 +0200
+++ b/mcabber/src/otr.c	Tue Apr 14 20:36:08 2009 +0200
@@ -408,13 +408,17 @@
   char *htmlmsg;
   ConnContext * ctx = otr_get_context(buddy);
 
-  htmlmsg = html_escape(*msg);
-
-  err = otrl_message_sending(userstate, &ops, NULL, ctx->accountname,
-                             ctx->protocol, ctx->username, htmlmsg, NULL,
-                             &newmessage, NULL, NULL);
-
-  g_free(htmlmsg);
+  if (ctx->msgstate == OTRL_MSGSTATE_PLAINTEXT)
+    err = otrl_message_sending(userstate, &ops, NULL, ctx->accountname,
+                               ctx->protocol, ctx->username, *msg, NULL,
+                               &newmessage, NULL, NULL);
+  else {
+    htmlmsg = html_escape(*msg);
+    err = otrl_message_sending(userstate, &ops, NULL, ctx->accountname,
+                               ctx->protocol, ctx->username, htmlmsg, NULL,
+                               &newmessage, NULL, NULL);
+    g_free(htmlmsg);
+  }
 
   if (err)
     *msg = NULL; /*something went wrong, don't send the plain-message! */