Changeset 30093fa

Timestamp:

2016-11-12T02:30:32Z (8 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

727a68b

Parents:

fecdd71

Message:

otr: word_wrap long system messages ("unencrypted message received")

Files:

• irc.h (modified) (1 diff)
• irc_im.c (modified) (2 diffs)
• otr.c (modified) (3 diffs)

irc.h

@@ -29 +29 @@
 #define IRC_MAX_LINE 512
 #define IRC_MAX_ARGS 16
+#define IRC_WORD_WRAP 425
 
 #define IRC_LOGIN_TIMEOUT 60

irc_im.c

@@ -299 +299 @@
         }
 
-        wrapped = word_wrap(msg, 425);
+        wrapped = word_wrap(msg, IRC_WORD_WRAP);
         irc_send_msg(src_iu, message_type, dst, wrapped, prefix);
         g_free(wrapped);
@@ -673 +673 @@
         }
 
-        wrapped = word_wrap(msg, 425);
+        wrapped = word_wrap(msg, IRC_WORD_WRAP);
         irc_send_msg(iu, "PRIVMSG", ic->name, wrapped, ts);
         g_free(ts);

otr.c

@@ -1400 +1400 @@
 void display_otr_message(void *opdata, ConnContext *ctx, const char *fmt, ...)
 {
+        char *msg_, *msg;
         struct im_connection *ic =
                 check_imc(opdata, ctx->accountname, ctx->protocol);
@@ -1407 +1408 @@
 
         va_start(va, fmt);
-        char *msg = g_strdup_vprintf(fmt, va);
+        msg_ = g_strdup_vprintf(fmt, va);
         va_end(va);
+
+        msg = word_wrap(msg_, IRC_WORD_WRAP);
 
         if (u) {
@@ -1417 +1420 @@
         }
 
+        g_free(msg_);
         g_free(msg);
 }