Changeset be999a5 for protocols


Ignore:
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:
6 edited

Legend:

Unmodified
Added
Removed
  • protocols/jabber/jabber.c

    r237eadd rbe999a5  
    557557       
    558558        ret->name = "jabber";
     559    ret->mms = 0;                        /* no limit */
    559560        ret->login = jabber_login;
    560561        ret->init = jabber_init;
  • protocols/msn/msn.c

    r237eadd rbe999a5  
    336336       
    337337        ret->name = "msn";
     338    ret->mms = 1409;         /* this guess taken from libotr UPGRADING file */
    338339        ret->login = msn_login;
    339340        ret->init = msn_init;
  • protocols/nogaim.h

    r237eadd rbe999a5  
    6868#define OPT_TYPING      0x00000100 /* Some pieces of code make assumptions */
    6969#define OPT_THINKING    0x00000200 /* about these values... Stupid me! */
     70#define OPT_NOOTR       0x00001000 /* protocol not suitable for OTR */
    7071
    7172/* ok. now the fun begins. first we create a connection structure */
     
    142143        const char *name;
    143144        void *data;
     145        /* Maximum Message Size of this protocol.
     146         * - Introduced for OTR, in order to fragment large protocol messages.
     147         * - 0 means "unlimited". */
     148        unsigned int mms;
    144149
    145150        /* Added this one to be able to add per-account settings, don't think
  • protocols/oscar/oscar.c

    r237eadd rbe999a5  
    26042604        struct prpl *ret = g_new0(struct prpl, 1);
    26052605        ret->name = "oscar";
     2606    ret->mms = 2343;       /* this guess taken from libotr UPGRADING file */
    26062607        ret->away_states = oscar_away_states;
    26072608        ret->init = oscar_init;
  • protocols/twitter/twitter.c

    r237eadd rbe999a5  
    519519        struct prpl *ret = g_new0(struct prpl, 1);
    520520       
     521        ret->options = OPT_NOOTR;
    521522        ret->name = "twitter";
    522523        ret->login = twitter_login;
  • protocols/yahoo/yahoo.c

    r237eadd rbe999a5  
    379379        struct prpl *ret = g_new0(struct prpl, 1);
    380380        ret->name = "yahoo";
     381    ret->mms = 832;           /* this guess taken from libotr UPGRADING file */
    381382        ret->init = byahoo_init;
    382383       
Note: See TracChangeset for help on using the changeset viewer.