Changeset 1dd3470

Timestamp:

2010-06-03T21:47:53Z (14 years ago)

Author:

Sven Moritz Hallberg <pesco@…>

Branches:

master

Children:

3759849

Parents:

bb09b3c

Message:

add an option to disable otr on twitter (and other unsuitable protocols)

Files:

• otr.c (modified) (3 diffs)
• protocols/nogaim.h (modified) (2 diffs)
• protocols/twitter/twitter.c (modified) (1 diff)

otr.c

@@ -304 +304 @@
         OtrlPrivKey *k;
         
+        /* don't do OTR on certain (not classic IM) protocols, e.g. twitter */
+        if(a->prpl->options & OPT_NOOTR) {
+                return 0;
+        }
+        
         k = otrl_privkey_find(irc->otr->us, a->user, a->prpl->name);
         if(k) {
@@ -324 +329 @@
         OtrlTLV *tlvs = NULL;
         char *colormsg;
+        
+        /* don't do OTR on certain (not classic IM) protocols, e.g. twitter */
+        if(ic->acc->prpl->options & OPT_NOOTR) {
+                return (g_strdup(msg));
+        }
         
         ignore_msg = otrl_message_receiving(ic->irc->otr->us, &global.otr_ops, ic,
@@ -371 +381 @@
         char *otrmsg = NULL;
         ConnContext *ctx = NULL;
+
+        /* don't do OTR on certain (not classic IM) protocols, e.g. twitter */
+        if(ic->acc->prpl->options & OPT_NOOTR) {
+                return (ic->acc->prpl->buddy_msg(ic, handle, msg, flags));
+        }
         
         st = otrl_message_sending(ic->irc->otr->us, &global.otr_ops, ic,

protocols/nogaim.h

@@ -59 +59 @@
 #define OPT_TYPING      0x00000100 /* Some pieces of code make assumptions */
 #define OPT_THINKING    0x00000200 /* about these values... Stupid me! */
+#define OPT_NOOTR       0x00001000 /* protocol not suitable for OTR */
 
 /* ok. now the fun begins. first we create a connection structure */
@@ -132 +133 @@
          * - The user sees this name ie. when imcb_log() is used. */
         const char *name;
-    /* Maximum Message Size of this protocol.
-     * - Introduced for OTR, in order to fragment large protocol messages.
-     * - 0 means "unlimited". */
-    unsigned int mms;
+        /* Maximum Message Size of this protocol.
+         * - Introduced for OTR, in order to fragment large protocol messages.
+         * - 0 means "unlimited". */
+        unsigned int mms;
 
         /* Added this one to be able to add per-account settings, don't think

protocols/twitter/twitter.c

@@ -336 +336 @@
         struct prpl *ret = g_new0(struct prpl, 1);
         
+        ret->options = OPT_NOOTR;
         ret->name = "twitter";
         ret->login = twitter_login;