Changeset f6c963b for protocols

Timestamp:

2007-04-21T04:13:21Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

d11dd2f

Parents:

b0eaa5b

Message:

Renamed some more prpl functions.

Location:

protocols

Files:

• jabber/jabber.c (modified) (3 diffs)
• msn/msn.c (modified) (5 diffs)
• nogaim.c (modified) (3 diffs)
• nogaim.h (modified) (3 diffs)
• oscar/oscar.c (modified) (4 diffs)
• yahoo/yahoo.c (modified) (4 diffs)

protocols/jabber/jabber.c

@@ -219 +219 @@
 }
 
-static int jabber_send_im( struct im_connection *ic, char *who, char *message, int flags )
+static int jabber_buddy_msg( struct im_connection *ic, char *who, char *message, int flags )
 {
         struct jabber_data *jd = ic->proto_data;
@@ -386 +386 @@
         ret->init = jabber_init;
         ret->logout = jabber_logout;
-        ret->send_im = jabber_send_im;
+        ret->buddy_msg = jabber_buddy_msg;
         ret->away_states = jabber_away_states;
 //      ret->get_status_string = jabber_get_status_string;
@@ -394 +394 @@
         ret->add_buddy = jabber_add_buddy;
         ret->remove_buddy = jabber_remove_buddy;
-//      ret->chat_send = jabber_chat_send;
+//      ret->chat_msg = jabber_chat_msg;
 //      ret->chat_invite = jabber_chat_invite;
 //      ret->chat_leave = jabber_chat_leave;

protocols/msn/msn.c

@@ -122 +122 @@
 }
 
-static int msn_send_im( struct im_connection *ic, char *who, char *message, int away )
+static int msn_buddy_msg( struct im_connection *ic, char *who, char *message, int away )
 {
         struct msn_switchboard *sb;
@@ -231 +231 @@
 }
 
-static void msn_chat_send( struct groupchat *c, char *message, int flags )
+static void msn_chat_msg( struct groupchat *c, char *message, int flags )
 {
         struct msn_switchboard *sb = msn_sb_by_chat( c );
@@ -343 +343 @@
 {
         if( typing )
-                return( msn_send_im( ic, who, TYPING_NOTIFICATION_MESSAGE, 0 ) );
+                return( msn_buddy_msg( ic, who, TYPING_NOTIFICATION_MESSAGE, 0 ) );
         else
                 return( 1 );
@@ -387 +387 @@
         ret->init = msn_init;
         ret->logout = msn_logout;
-        ret->send_im = msn_send_im;
+        ret->buddy_msg = msn_buddy_msg;
         ret->away_states = msn_away_states;
         ret->set_away = msn_set_away;
@@ -394 +394 @@
         ret->add_buddy = msn_add_buddy;
         ret->remove_buddy = msn_remove_buddy;
-        ret->chat_send = msn_chat_send;
+        ret->chat_msg = msn_chat_msg;
         ret->chat_invite = msn_chat_invite;
         ret->chat_leave = msn_chat_leave;

protocols/nogaim.c

@@ -282 +282 @@
 void cancel_auto_reconnect( account_t *a )
 {
-        /* while( b_event_remove_by_data( (gpointer) a ) ); */
         b_event_remove( a->reconnect );
         a->reconnect = 0;
@@ -948 +947 @@
         }
         
-        st = ic->acc->prpl->send_im( ic, handle, msg, flags );
+        st = ic->acc->prpl->buddy_msg( ic, handle, msg, flags );
         g_free( buf );
         
@@ -964 +963 @@
         }
         
-        c->ic->acc->prpl->chat_send( c, msg, flags );
+        c->ic->acc->prpl->chat_msg( c, msg, flags );
         g_free( buf );
         

protocols/nogaim.h

@@ -134 +134 @@
         void (* logout)         (struct im_connection *);
         
-        int  (* send_im)        (struct im_connection *, char *to, char *message, int flags);
+        int  (* buddy_msg)      (struct im_connection *, char *to, char *message, int flags);
         void (* set_away)       (struct im_connection *, char *state, char *message);
         void (* get_away)       (struct im_connection *, char *who);
@@ -160 +160 @@
         void (* chat_invite)    (struct groupchat *, char *who, char *message);
         void (* chat_leave)     (struct groupchat *);
-        void (* chat_send)      (struct groupchat *, char *message, int flags);
+        void (* chat_msg)       (struct groupchat *, char *message, int flags);
         struct groupchat *
              (* chat_with)      (struct im_connection *, char *who);
@@ -175 +175 @@
 void nogaim_init();
 G_MODULE_EXPORT GSList *get_connections();
-G_MODULE_EXPORT struct prpl *find_protocol(const char *name);
-G_MODULE_EXPORT void register_protocol(struct prpl *);
+G_MODULE_EXPORT struct prpl *find_protocol( const char *name );
+G_MODULE_EXPORT void register_protocol( struct prpl * );
 
 /* Connection management. */

protocols/oscar/oscar.c

@@ -1808 +1808 @@
 }
 
-static int oscar_send_im(struct im_connection *ic, char *name, char *message, int imflags) {
+static int oscar_buddy_msg(struct im_connection *ic, char *name, char *message, int imflags) {
         struct oscar_data *odata = (struct oscar_data *)ic->proto_data;
         int ret = 0, len = strlen(message);
@@ -2451 +2451 @@
 }
 
-void oscar_chat_send(struct groupchat *c, char *message, int msgflags)
+void oscar_chat_msg(struct groupchat *c, char *message, int msgflags)
 {
         struct im_connection *ic = c->ic;
@@ -2590 +2590 @@
         ret->keepalive = oscar_keepalive;
         ret->logout = oscar_logout;
-        ret->send_im = oscar_send_im;
+        ret->buddy_msg = oscar_buddy_msg;
         ret->get_info = oscar_get_info;
         ret->set_away = oscar_set_away;
@@ -2596 +2596 @@
         ret->add_buddy = oscar_add_buddy;
         ret->remove_buddy = oscar_remove_buddy;
-        ret->chat_send = oscar_chat_send;
+        ret->chat_msg = oscar_chat_msg;
         ret->chat_invite = oscar_chat_invite;
         ret->chat_leave = oscar_chat_leave;

protocols/yahoo/yahoo.c

@@ -174 +174 @@
 }
 
-static int byahoo_send_im( struct im_connection *ic, char *who, char *what, int flags )
+static int byahoo_buddy_msg( struct im_connection *ic, char *who, char *what, int flags )
 {
         struct byahoo_data *yd = ic->proto_data;
@@ -299 +299 @@
 }
 
-static void byahoo_chat_send( struct groupchat *c, char *message, int flags )
+static void byahoo_chat_msg( struct groupchat *c, char *message, int flags )
 {
         struct byahoo_data *yd = (struct byahoo_data *) c->ic->proto_data;
@@ -354 +354 @@
         ret->logout = byahoo_logout;
         
-        ret->send_im = byahoo_send_im;
+        ret->buddy_msg = byahoo_buddy_msg;
         ret->get_info = byahoo_get_info;
         ret->away_states = byahoo_away_states;
@@ -362 +362 @@
         ret->send_typing = byahoo_send_typing;
         
-        ret->chat_send = byahoo_chat_send;
+        ret->chat_msg = byahoo_chat_msg;
         ret->chat_invite = byahoo_chat_invite;
         ret->chat_leave = byahoo_chat_leave;