Changeset f6c963b


Ignore:
Timestamp:
2007-04-21T04:13:21Z (17 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
d11dd2f
Parents:
b0eaa5b
Message:

Renamed some more prpl functions.

Location:
protocols
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • protocols/jabber/jabber.c

    rb0eaa5b rf6c963b  
    219219}
    220220
    221 static int jabber_send_im( struct im_connection *ic, char *who, char *message, int flags )
     221static int jabber_buddy_msg( struct im_connection *ic, char *who, char *message, int flags )
    222222{
    223223        struct jabber_data *jd = ic->proto_data;
     
    386386        ret->init = jabber_init;
    387387        ret->logout = jabber_logout;
    388         ret->send_im = jabber_send_im;
     388        ret->buddy_msg = jabber_buddy_msg;
    389389        ret->away_states = jabber_away_states;
    390390//      ret->get_status_string = jabber_get_status_string;
     
    394394        ret->add_buddy = jabber_add_buddy;
    395395        ret->remove_buddy = jabber_remove_buddy;
    396 //      ret->chat_send = jabber_chat_send;
     396//      ret->chat_msg = jabber_chat_msg;
    397397//      ret->chat_invite = jabber_chat_invite;
    398398//      ret->chat_leave = jabber_chat_leave;
  • protocols/msn/msn.c

    rb0eaa5b rf6c963b  
    122122}
    123123
    124 static int msn_send_im( struct im_connection *ic, char *who, char *message, int away )
     124static int msn_buddy_msg( struct im_connection *ic, char *who, char *message, int away )
    125125{
    126126        struct msn_switchboard *sb;
     
    231231}
    232232
    233 static void msn_chat_send( struct groupchat *c, char *message, int flags )
     233static void msn_chat_msg( struct groupchat *c, char *message, int flags )
    234234{
    235235        struct msn_switchboard *sb = msn_sb_by_chat( c );
     
    343343{
    344344        if( typing )
    345                 return( msn_send_im( ic, who, TYPING_NOTIFICATION_MESSAGE, 0 ) );
     345                return( msn_buddy_msg( ic, who, TYPING_NOTIFICATION_MESSAGE, 0 ) );
    346346        else
    347347                return( 1 );
     
    387387        ret->init = msn_init;
    388388        ret->logout = msn_logout;
    389         ret->send_im = msn_send_im;
     389        ret->buddy_msg = msn_buddy_msg;
    390390        ret->away_states = msn_away_states;
    391391        ret->set_away = msn_set_away;
     
    394394        ret->add_buddy = msn_add_buddy;
    395395        ret->remove_buddy = msn_remove_buddy;
    396         ret->chat_send = msn_chat_send;
     396        ret->chat_msg = msn_chat_msg;
    397397        ret->chat_invite = msn_chat_invite;
    398398        ret->chat_leave = msn_chat_leave;
  • protocols/nogaim.c

    rb0eaa5b rf6c963b  
    282282void cancel_auto_reconnect( account_t *a )
    283283{
    284         /* while( b_event_remove_by_data( (gpointer) a ) ); */
    285284        b_event_remove( a->reconnect );
    286285        a->reconnect = 0;
     
    948947        }
    949948       
    950         st = ic->acc->prpl->send_im( ic, handle, msg, flags );
     949        st = ic->acc->prpl->buddy_msg( ic, handle, msg, flags );
    951950        g_free( buf );
    952951       
     
    964963        }
    965964       
    966         c->ic->acc->prpl->chat_send( c, msg, flags );
     965        c->ic->acc->prpl->chat_msg( c, msg, flags );
    967966        g_free( buf );
    968967       
  • protocols/nogaim.h

    rb0eaa5b rf6c963b  
    134134        void (* logout)         (struct im_connection *);
    135135       
    136         int  (* send_im)        (struct im_connection *, char *to, char *message, int flags);
     136        int  (* buddy_msg)      (struct im_connection *, char *to, char *message, int flags);
    137137        void (* set_away)       (struct im_connection *, char *state, char *message);
    138138        void (* get_away)       (struct im_connection *, char *who);
     
    160160        void (* chat_invite)    (struct groupchat *, char *who, char *message);
    161161        void (* chat_leave)     (struct groupchat *);
    162         void (* chat_send)      (struct groupchat *, char *message, int flags);
     162        void (* chat_msg)       (struct groupchat *, char *message, int flags);
    163163        struct groupchat *
    164164             (* chat_with)      (struct im_connection *, char *who);
     
    175175void nogaim_init();
    176176G_MODULE_EXPORT GSList *get_connections();
    177 G_MODULE_EXPORT struct prpl *find_protocol(const char *name);
    178 G_MODULE_EXPORT void register_protocol(struct prpl *);
     177G_MODULE_EXPORT struct prpl *find_protocol( const char *name );
     178G_MODULE_EXPORT void register_protocol( struct prpl * );
    179179
    180180/* Connection management. */
  • protocols/oscar/oscar.c

    rb0eaa5b rf6c963b  
    18081808}
    18091809
    1810 static int oscar_send_im(struct im_connection *ic, char *name, char *message, int imflags) {
     1810static int oscar_buddy_msg(struct im_connection *ic, char *name, char *message, int imflags) {
    18111811        struct oscar_data *odata = (struct oscar_data *)ic->proto_data;
    18121812        int ret = 0, len = strlen(message);
     
    24512451}
    24522452
    2453 void oscar_chat_send(struct groupchat *c, char *message, int msgflags)
     2453void oscar_chat_msg(struct groupchat *c, char *message, int msgflags)
    24542454{
    24552455        struct im_connection *ic = c->ic;
     
    25902590        ret->keepalive = oscar_keepalive;
    25912591        ret->logout = oscar_logout;
    2592         ret->send_im = oscar_send_im;
     2592        ret->buddy_msg = oscar_buddy_msg;
    25932593        ret->get_info = oscar_get_info;
    25942594        ret->set_away = oscar_set_away;
     
    25962596        ret->add_buddy = oscar_add_buddy;
    25972597        ret->remove_buddy = oscar_remove_buddy;
    2598         ret->chat_send = oscar_chat_send;
     2598        ret->chat_msg = oscar_chat_msg;
    25992599        ret->chat_invite = oscar_chat_invite;
    26002600        ret->chat_leave = oscar_chat_leave;
  • protocols/yahoo/yahoo.c

    rb0eaa5b rf6c963b  
    174174}
    175175
    176 static int byahoo_send_im( struct im_connection *ic, char *who, char *what, int flags )
     176static int byahoo_buddy_msg( struct im_connection *ic, char *who, char *what, int flags )
    177177{
    178178        struct byahoo_data *yd = ic->proto_data;
     
    299299}
    300300
    301 static void byahoo_chat_send( struct groupchat *c, char *message, int flags )
     301static void byahoo_chat_msg( struct groupchat *c, char *message, int flags )
    302302{
    303303        struct byahoo_data *yd = (struct byahoo_data *) c->ic->proto_data;
     
    354354        ret->logout = byahoo_logout;
    355355       
    356         ret->send_im = byahoo_send_im;
     356        ret->buddy_msg = byahoo_buddy_msg;
    357357        ret->get_info = byahoo_get_info;
    358358        ret->away_states = byahoo_away_states;
     
    362362        ret->send_typing = byahoo_send_typing;
    363363       
    364         ret->chat_send = byahoo_chat_send;
     364        ret->chat_msg = byahoo_chat_msg;
    365365        ret->chat_invite = byahoo_chat_invite;
    366366        ret->chat_leave = byahoo_chat_leave;
Note: See TracChangeset for help on using the changeset viewer.