Ignore:
Timestamp:
2006-05-26T09:03:38Z (15 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
cdca30b
Parents:
41ca004 (diff), c53911e (diff), 7bfd574 (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:

Merging from main development tree.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • protocols/nogaim.h

    r41ca004 r68b518d6  
    5252#define BUDDY_ALIAS_MAXLEN 388   /* because MSN names can be 387 characters */
    5353
    54 #define WEBSITE "http://www.bitlee.org/"
     54#define WEBSITE "http://www.bitlbee.org/"
    5555#define IM_FLAG_AWAY 0x0020
    5656#define OPT_CONN_HTML 0x00000001
     
    194194
    195195/* nogaim.c */
    196 int serv_send_im(irc_t *irc, user_t *u, char *msg, int flags);
    197 int serv_send_chat(irc_t *irc, struct gaim_connection *gc, int id, char *msg );
     196int bim_set_away( struct gaim_connection *gc, char *away );
     197int bim_buddy_msg( struct gaim_connection *gc, char *handle, char *msg, int flags );
     198int bim_chat_msg( struct gaim_connection *gc, int id, char *msg );
     199
     200void bim_add_allow( struct gaim_connection *gc, char *handle );
     201void bim_rem_allow( struct gaim_connection *gc, char *handle );
     202void bim_add_block( struct gaim_connection *gc, char *handle );
     203void bim_rem_block( struct gaim_connection *gc, char *handle );
    198204
    199205void nogaim_init();
    200 int proto_away( struct gaim_connection *gc, char *away );
    201206char *set_eval_away_devoice( irc_t *irc, set_t *set, char *value );
    202207
     
    210215G_MODULE_EXPORT void hide_login_progress( struct gaim_connection *gc, char *msg );
    211216G_MODULE_EXPORT void hide_login_progress_error( struct gaim_connection *gc, char *msg );
    212 G_MODULE_EXPORT void serv_got_crap( struct gaim_connection *gc, char *format, ... );
     217G_MODULE_EXPORT void serv_got_crap( struct gaim_connection *gc, char *format, ... ) G_GNUC_PRINTF( 2, 3 );
    213218G_MODULE_EXPORT void account_online( struct gaim_connection *gc );
    214219G_MODULE_EXPORT void signoff( struct gaim_connection *gc );
Note: See TracChangeset for help on using the changeset viewer.