Ignore:
Timestamp:
2012-10-01T22:51:39Z (9 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
4fdb102
Parents:
a992d7a (diff), 4c9d377 (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:

Merge msnp18 branch. It's stable enough and really not that intrusive.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • protocols/msn/msn.h

    ra992d7a r06aed9a  
    22  * BitlBee -- An IRC to other IM-networks gateway                     *
    33  *                                                                    *
    4   * Copyright 2002-2010 Wilmer van der Gaast and others                *
     4  * Copyright 2002-2012 Wilmer van der Gaast and others                *
    55  \********************************************************************/
    66
     
    5353*/
    5454
     55/* <= BitlBee 3.0.5
    5556#define MSNP11_PROD_KEY "ILTXC!4IXB5FB*PX"
    5657#define MSNP11_PROD_ID  "PROD0119GSJUC$18"
    57 #define MSNP_VER        "MSNP15"
    58 #define MSNP_BUILD      "8.5.1288"
     58*/
     59
     60#define MSNP11_PROD_KEY "C1BX{V4W}Q3*10SM"
     61#define MSNP11_PROD_ID  "PROD0120PW!CCV9@"
     62#define MSNP_VER        "MSNP18"
     63#define MSNP_BUILD      "14.0.8117.416"
    5964
    6065#define MSN_SB_NEW         -24062002
     66
     67#define MSN_CAP1        0xC000
     68#define MSN_CAP2        0x0000
    6169
    6270#define MSN_MESSAGE_HEADERS "MIME-Version: 1.0\r\n" \
     
    118126        char *tokens[4];
    119127        char *lock_key, *pp_policy;
     128        char *uuid;
    120129       
    121130        GSList *msgq, *grpq, *soapq;
     
    189198        MSN_BUDDY_PL = 16,
    190199        MSN_BUDDY_ADL_SYNCED = 256,
     200        MSN_BUDDY_FED = 512,
    191201} msn_buddy_flags_t;
    192202
     
    222232
    223233/* ns.c */
    224 int msn_ns_write( struct im_connection *ic, int fd, const char *fmt, ... );
     234int msn_ns_write( struct im_connection *ic, int fd, const char *fmt, ... ) G_GNUC_PRINTF( 3, 4 );
    225235gboolean msn_ns_connect( struct im_connection *ic, struct msn_handler_data *handler, const char *host, int port );
    226236void msn_ns_close( struct msn_handler_data *handler );
     
    228238void msn_auth_got_contact_list( struct im_connection *ic );
    229239int msn_ns_finish_login( struct im_connection *ic );
     240int msn_ns_sendmessage( struct im_connection *ic, struct bee_user *bu, const char *text );
     241void msn_ns_oim_send_queue( struct im_connection *ic, GSList **msgq );
    230242
    231243/* msn_util.c */
     
    242254struct msn_group *msn_group_by_id( struct im_connection *ic, const char *id );
    243255int msn_ns_set_display_name( struct im_connection *ic, const char *value );
     256const char *msn_normalize_handle( const char *handle );
    244257
    245258/* tables.c */
     
    250263
    251264/* sb.c */
    252 int msn_sb_write( struct msn_switchboard *sb, const char *fmt, ... );
     265int msn_sb_write( struct msn_switchboard *sb, const char *fmt, ... ) G_GNUC_PRINTF( 2, 3 );;
    253266struct msn_switchboard *msn_sb_create( struct im_connection *ic, char *host, int port, char *key, int session );
    254 struct msn_switchboard *msn_sb_by_handle( struct im_connection *ic, char *handle );
     267struct msn_switchboard *msn_sb_by_handle( struct im_connection *ic, const char *handle );
    255268struct msn_switchboard *msn_sb_by_chat( struct groupchat *c );
    256269struct msn_switchboard *msn_sb_spare( struct im_connection *ic );
Note: See TracChangeset for help on using the changeset viewer.