First step in this merge. Mostly a bzr merge and then a cleanup of conflicts

and parts I want to/have to redo (because of ui-fix).

6 files changed, 10 insertions, 0 deletions

diff --git a/protocols/jabber/jabber.c b/protocols/jabber/jabber.c
index f7e1e664..e6f38e26 100644
--- a/protocols/jabber/jabber.c
+++ b/protocols/jabber/jabber.c
@@ -556,6 +556,7 @@ void jabber_initmodule()
 	struct prpl *ret = g_new0( struct prpl, 1 );
 	
 	ret->name = "jabber";
+    ret->mms = 0;                        /* no limit */
 	ret->login = jabber_login;
 	ret->init = jabber_init;
 	ret->logout = jabber_logout;
diff --git a/protocols/msn/msn.c b/protocols/msn/msn.c
index 60d58532..29b7cecc 100644
--- a/protocols/msn/msn.c
+++ b/protocols/msn/msn.c
@@ -335,6 +335,7 @@ void msn_initmodule()
 	struct prpl *ret = g_new0(struct prpl, 1);
 	
 	ret->name = "msn";
+    ret->mms = 1409;         /* this guess taken from libotr UPGRADING file */
 	ret->login = msn_login;
 	ret->init = msn_init;
 	ret->logout = msn_logout;
diff --git a/protocols/nogaim.h b/protocols/nogaim.h
index 693b5d16..cf6cdc30 100644
--- a/protocols/nogaim.h
+++ b/protocols/nogaim.h
@@ -67,6 +67,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
@@ -141,6 +142,10 @@ struct prpl {
 	 * - The user sees this name ie. when imcb_log() is used. */
 	const char *name;
 	void *data;
+	/* 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/oscar/oscar.c b/protocols/oscar/oscar.c
index db6a28f4..aba08c1f 100644
--- a/protocols/oscar/oscar.c
+++ b/protocols/oscar/oscar.c
@@ -2603,6 +2603,7 @@ void oscar_initmodule()
 {
 	struct prpl *ret = g_new0(struct prpl, 1);
 	ret->name = "oscar";
+    ret->mms = 2343;       /* this guess taken from libotr UPGRADING file */
 	ret->away_states = oscar_away_states;
 	ret->init = oscar_init;
 	ret->login = oscar_login;
diff --git a/protocols/twitter/twitter.c b/protocols/twitter/twitter.c
index d5b71bc3..16b069ee 100644
--- a/protocols/twitter/twitter.c
+++ b/protocols/twitter/twitter.c
@@ -518,6 +518,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;
diff --git a/protocols/yahoo/yahoo.c b/protocols/yahoo/yahoo.c
index 7708ed63..8b3b0c05 100644
--- a/protocols/yahoo/yahoo.c
+++ b/protocols/yahoo/yahoo.c
@@ -378,6 +378,7 @@ void byahoo_initmodule( )
 {
 	struct prpl *ret = g_new0(struct prpl, 1);
 	ret->name = "yahoo";
+    ret->mms = 832;           /* this guess taken from libotr UPGRADING file */
 	ret->init = byahoo_init;
 	
 	ret->login = byahoo_login;