Changeset 537d9b9 for otr.c

Timestamp:

2016-11-20T08:40:36Z (8 years ago)

Author:

dequis <dx@…>

Children:

3f44e43

Parents:

ba52ac5 (diff), 9f03c47 (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:

Merge master up to commit '9f03c47' into parson

File:

• otr.c (modified) (6 diffs)

otr.c

@@ -268 +268 @@
 }
 
+#ifndef OTR_BI
+struct plugin_info *init_plugin_info(void)
+{
+        static struct plugin_info info = {
+                BITLBEE_ABI_VERSION_CODE,
+                "otr",
+                BITLBEE_VERSION,
+                "Off-the-Record communication",
+                NULL,
+                NULL
+        };
+
+        return &info;
+}
+#endif
+
 gboolean otr_irc_new(irc_t *irc)
 {
@@ -413 +429 @@
 
         /* don't do OTR on certain (not classic IM) protocols, e.g. twitter */
-        if (a->prpl->options & OPT_NOOTR) {
+        if (a->prpl->options & PRPL_OPT_NOOTR) {
                 return 0;
         }
@@ -441 +457 @@
 
         /* don't do OTR on certain (not classic IM) protocols, e.g. twitter */
-        if (ic->acc->prpl->options & OPT_NOOTR ||
+        if (ic->acc->prpl->options & PRPL_OPT_NOOTR ||
             iu->bu->flags & BEE_USER_NOOTR) {
                 return msg;
@@ -1384 +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);
@@ -1391 +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) {
@@ -1401 +1420 @@
         }
 
+        g_free(msg_);
         g_free(msg);
 }