Renamed some more prpl functions.

6 files changed, 22 insertions, 23 deletions

diff --git a/protocols/jabber/jabber.c b/protocols/jabber/jabber.c
index e560fda0..c38be72e 100644
--- a/protocols/jabber/jabber.c
+++ b/protocols/jabber/jabber.c
@@ -218,7 +218,7 @@ static void jabber_logout( struct im_connection *ic )
 	g_free( jd );
 }
 
-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;
 	struct jabber_buddy *bud;
@@ -385,7 +385,7 @@ void jabber_initmodule()
 	ret->login = jabber_login;
 	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;
 	ret->set_away = jabber_set_away;
@@ -393,7 +393,7 @@ void jabber_initmodule()
 	ret->get_info = jabber_get_info;
 	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;
 //	ret->chat_open = jabber_chat_open;
diff --git a/protocols/msn/msn.c b/protocols/msn/msn.c
index 5eea68af..6d774806 100644
--- a/protocols/msn/msn.c
+++ b/protocols/msn/msn.c
@@ -121,7 +121,7 @@ static void msn_logout( struct im_connection *ic )
 	msn_connections = g_slist_remove( msn_connections, ic );
 }
 
-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;
 	struct msn_data *md = ic->proto_data;
@@ -230,7 +230,7 @@ static void msn_remove_buddy( struct im_connection *ic, char *who, char *group )
 	msn_buddy_list_remove( ic, "FL", who );
 }
 
-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 );
 	
@@ -342,7 +342,7 @@ static void msn_rem_deny( struct im_connection *ic, char *who )
 static int msn_send_typing( struct im_connection *ic, char *who, int typing )
 {
 	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 );
 }
@@ -386,14 +386,14 @@ void msn_initmodule()
 	ret->login = msn_login;
 	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;
 	ret->get_info = msn_get_info;
 	ret->set_my_name = msn_set_my_name;
 	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;
 	ret->chat_with = msn_chat_with;
diff --git a/protocols/nogaim.c b/protocols/nogaim.c
index c27a684d..a70d6eca 100644
--- a/protocols/nogaim.c
+++ b/protocols/nogaim.c
@@ -281,7 +281,6 @@ gboolean auto_reconnect( gpointer data, gint fd, b_input_condition cond )
 
 void cancel_auto_reconnect( account_t *a )
 {
-	/* while( b_event_remove_by_data( (gpointer) a ) ); */
 	b_event_remove( a->reconnect );
 	a->reconnect = 0;
 }
@@ -947,7 +946,7 @@ int imc_buddy_msg( struct im_connection *ic, char *handle, char *msg, int flags
 		msg = buf;
 	}
 	
-	st = ic->acc->prpl->send_im( ic, handle, msg, flags );
+	st = ic->acc->prpl->buddy_msg( ic, handle, msg, flags );
 	g_free( buf );
 	
 	return st;
@@ -963,7 +962,7 @@ int imc_chat_msg( struct groupchat *c, char *msg, int flags )
 		msg = buf;
 	}
 	
-	c->ic->acc->prpl->chat_send( c, msg, flags );
+	c->ic->acc->prpl->chat_msg( c, msg, flags );
 	g_free( buf );
 	
 	return 1;
diff --git a/protocols/nogaim.h b/protocols/nogaim.h
index c4b079ab..abf299e0 100644
--- a/protocols/nogaim.h
+++ b/protocols/nogaim.h
@@ -133,7 +133,7 @@ struct prpl {
 	void (* keepalive)	(struct im_connection *);
 	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);
 	int  (* send_typing)	(struct im_connection *, char *who, int flags);
@@ -159,7 +159,7 @@ struct prpl {
 	/* Group chat stuff. */
 	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);
 	struct groupchat *
@@ -174,8 +174,8 @@ struct prpl {
 /* im_api core stuff. */
 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. */
 G_MODULE_EXPORT struct im_connection *imcb_new( account_t *acc );
diff --git a/protocols/oscar/oscar.c b/protocols/oscar/oscar.c
index a23e8a5a..a088624a 100644
--- a/protocols/oscar/oscar.c
+++ b/protocols/oscar/oscar.c
@@ -1807,7 +1807,7 @@ static void oscar_keepalive(struct im_connection *ic) {
 	aim_flap_nop(odata->sess, odata->conn);
 }
 
-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);
 	if (imflags & OPT_AWAY) {
@@ -2450,7 +2450,7 @@ int oscar_send_typing(struct im_connection *ic, char * who, int typing)
 	return( aim_im_sendmtn(od->sess, 1, who, typing ? 0x0002 : 0x0000) );
 }
 
-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;
 	struct oscar_data * od = (struct oscar_data*)ic->proto_data;
@@ -2589,13 +2589,13 @@ void oscar_initmodule()
 	ret->login = oscar_login;
 	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;
 	ret->get_away = oscar_get_away;
 	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;
 	ret->chat_with = oscar_chat_with;
diff --git a/protocols/yahoo/yahoo.c b/protocols/yahoo/yahoo.c
index 7bf3f333..0a49baac 100644
--- a/protocols/yahoo/yahoo.c
+++ b/protocols/yahoo/yahoo.c
@@ -173,7 +173,7 @@ static void byahoo_get_info(struct im_connection *ic, char *who)
 			who);
 }
 
-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;
 	
@@ -298,7 +298,7 @@ static void byahoo_remove_buddy( struct im_connection *ic, char *who, char *grou
 	}
 }
 
-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;
 	
@@ -353,7 +353,7 @@ void byahoo_initmodule( )
 	ret->keepalive = byahoo_keepalive;
 	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;
 	ret->set_away = byahoo_set_away;
@@ -361,7 +361,7 @@ void byahoo_initmodule( )
 	ret->remove_buddy = byahoo_remove_buddy;
 	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;
 	ret->chat_with = byahoo_chat_with;