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

2 files changed, 6 insertions, 4 deletions

diff --git a/protocols/nogaim.h b/protocols/nogaim.h
index d3f5847f..62d800c6 100644
--- a/protocols/nogaim.h
+++ b/protocols/nogaim.h
@@ -58,6 +58,7 @@
 #define OPT_LOCALBUDDY  0x00000020 /* For nicks local to one groupchat */
 #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 */
 struct im_connection
@@ -131,10 +132,10 @@ struct prpl {
 	/* You should set this to the name of your protocol.
 	 * - 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
 	 * it should be used for anything else. You are supposed to use the
diff --git a/protocols/twitter/twitter.c b/protocols/twitter/twitter.c
index 98e85641..afa2fb32 100644
--- a/protocols/twitter/twitter.c
+++ b/protocols/twitter/twitter.c
@@ -335,6 +335,7 @@ void twitter_initmodule()
 {
 	struct prpl *ret = g_new0(struct prpl, 1);
 	
+	ret->options = OPT_NOOTR;
 	ret->name = "twitter";
 	ret->login = twitter_login;
 	ret->init = twitter_init;