Changes in otr.c [9f03c47:47ab9a9]

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)
 {
@@ -429 +413 @@
 
         /* don't do OTR on certain (not classic IM) protocols, e.g. twitter */
-        if (a->prpl->options & PRPL_OPT_NOOTR) {
+        if (a->prpl->options & OPT_NOOTR) {
                 return 0;
         }
@@ -457 +441 @@
 
         /* don't do OTR on certain (not classic IM) protocols, e.g. twitter */
-        if (ic->acc->prpl->options & PRPL_OPT_NOOTR ||
+        if (ic->acc->prpl->options & OPT_NOOTR ||
             iu->bu->flags & BEE_USER_NOOTR) {
                 return msg;
@@ -1400 +1384 @@
 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);
@@ -1408 +1391 @@
 
         va_start(va, fmt);
-        msg_ = g_strdup_vprintf(fmt, va);
+        char *msg = g_strdup_vprintf(fmt, va);
         va_end(va);
-
-        msg = word_wrap(msg_, IRC_WORD_WRAP);
 
         if (u) {
@@ -1420 +1401 @@
         }
 
-        g_free(msg_);
         g_free(msg);
 }