Changeset be999a5 for protocols

Timestamp:

2010-08-23T23:12:24Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

ad2d8bc

Parents:

237eadd (diff), eb6df6a (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:

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).

Location:

protocols

Files:

• jabber/jabber.c (modified) (1 diff)
• msn/msn.c (modified) (1 diff)
• nogaim.h (modified) (2 diffs)
• oscar/oscar.c (modified) (1 diff)
• twitter/twitter.c (modified) (1 diff)
• yahoo/yahoo.c (modified) (1 diff)

protocols/jabber/jabber.c

@@ -557 +557 @@
         
         ret->name = "jabber";
+    ret->mms = 0;                        /* no limit */
         ret->login = jabber_login;
         ret->init = jabber_init;

protocols/msn/msn.c

@@ -336 +336 @@
         
         ret->name = "msn";
+    ret->mms = 1409;         /* this guess taken from libotr UPGRADING file */
         ret->login = msn_login;
         ret->init = msn_init;

protocols/nogaim.h

@@ -68 +68 @@
 #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 */
@@ -142 +143 @@
         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

protocols/oscar/oscar.c

@@ -2604 +2604 @@
         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;

protocols/twitter/twitter.c

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

protocols/yahoo/yahoo.c

@@ -379 +379 @@
         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;