Mercurial > pidgin.yaz

changeset 5793:952710ac6635

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 6218] Removed the double-underscore before identifiers. These are reserved by ANSI C. committer: Tailor Script <tailor@pidgin.im>
author Christian Hammond <chipx86@chipx86.com>
date Sat, 07 Jun 2003 06:41:31 +0000
parents d89cadcafbec
children 5e93fc46d1af
files src/protocols/msn/buddyicon.c src/protocols/msn/dispatch.c src/protocols/msn/msn.c src/protocols/msn/notification.c src/protocols/msn/servconn.c src/protocols/msn/switchboard.c
diffstat 6 files changed, 195 insertions(+), 194 deletions(-) [+]
line wrap: on
line diff
--- a/src/protocols/msn/buddyicon.c	Sat Jun 07 06:09:02 2003 +0000
+++ b/src/protocols/msn/buddyicon.c	Sat Jun 07 06:41:31 2003 +0000
@@ -31,7 +31,7 @@
 	"0123456789+/";
 
 static char *
-__base64_enc(const char *data, int len)
+base64_enc(const char *data, int len)
 {
 	char *dest;
 	char *buf;
@@ -71,8 +71,8 @@
 }
 
 static gboolean
-__get_buddy_icon_info(GaimAccount *account, char **base64,
-					  char **md5sum, int *file_size, int *base64_size)
+get_buddy_icon_info(GaimAccount *account, char **base64,
+					char **md5sum, int *file_size, int *base64_size)
 {
 	FILE *fp;
 	struct stat sb;
@@ -99,7 +99,7 @@
 
 			buf[sb.st_size] = '\0';
 
-			temp = __base64_enc(buf, sb.st_size);
+			temp = base64_enc(buf, sb.st_size);
 
 			if (base64_size != NULL)
 				*base64_size = strlen(temp);
@@ -141,7 +141,7 @@
 }
 
 static gboolean
-__send_icon_data(MsnSwitchBoard *swboard, MsnBuddyIconXfer *buddyicon)
+send_icon_data(MsnSwitchBoard *swboard, MsnBuddyIconXfer *buddyicon)
 {
 	GaimConnection *gc = swboard->servconn->session->account->gc;
 	char buf[MSN_BUF_LEN];
@@ -197,7 +197,7 @@
 }
 
 static gboolean
-__process_invite(MsnServConn *servconn, const MsnMessage *msg)
+process_invite(MsnServConn *servconn, const MsnMessage *msg)
 {
 	MsnSession *session = servconn->session;
 	GaimConnection *gc = session->account->gc;
@@ -308,11 +308,11 @@
 
 		swboard->buddy_icon_xfer = buddyicon = msn_buddy_icon_xfer_new();
 
-		if (!__get_buddy_icon_info(gc->account,
-								   &buddyicon->data,
-								   &buddyicon->md5sum,
-								   &buddyicon->file_size,
-								   &buddyicon->total_size)) {
+		if (!get_buddy_icon_info(gc->account,
+								 &buddyicon->data,
+								 &buddyicon->md5sum,
+								 &buddyicon->file_size,
+								 &buddyicon->total_size)) {
 
 			msn_buddy_icon_xfer_destroy(buddyicon);
 
@@ -341,7 +341,7 @@
 			msn_switchboard_destroy(swboard);
 		}
 
-		return __send_icon_data(swboard, buddyicon);
+		return send_icon_data(swboard, buddyicon);
 	}
 	else if (!strcmp(command, "ACK")) {
 		swboard = (MsnSwitchBoard *)servconn->data;
@@ -349,7 +349,7 @@
 		buddyicon = swboard->buddy_icon_xfer;
 
 		if (buddyicon != NULL)
-			return __send_icon_data(swboard, buddyicon);
+			return send_icon_data(swboard, buddyicon);
 	}
 	else if (!strcmp(command, "COMPLETE")) {
 		const char *passport;
@@ -396,7 +396,7 @@
 }
 
 static gboolean
-__process_data(MsnServConn *servconn, const MsnMessage *msg)
+process_data(MsnServConn *servconn, const MsnMessage *msg)
 {
 	GaimConnection *gc = servconn->session->account->gc;
 	MsnSwitchBoard *swboard;
@@ -466,9 +466,9 @@
 msn_buddy_icon_msg(MsnServConn *servconn, MsnMessage *msg)
 {
 	if (!strncmp(msn_message_get_body(msg), "ICON", 4))
-		return __process_data(servconn, msg);
+		return process_data(servconn, msg);
 	else
-		return __process_invite(servconn, msg);
+		return process_invite(servconn, msg);
 }
 
 void
@@ -486,7 +486,7 @@
 	if (gaim_account_get_buddy_icon(account) == NULL)
 		return; /* We don't have an icon to send. */
 
-	if (!__get_buddy_icon_info(account, NULL, &md5sum,
+	if (!get_buddy_icon_info(account, NULL, &md5sum,
 							   &file_size, &base64_size)) {
 		return;
 	}
--- a/src/protocols/msn/dispatch.c	Sat Jun 07 06:09:02 2003 +0000
+++ b/src/protocols/msn/dispatch.c	Sat Jun 07 06:41:31 2003 +0000
@@ -27,8 +27,8 @@
 static GHashTable *dispatch_commands = NULL;
 
 static gboolean
-__ver_cmd(MsnServConn *servconn, const char *command, const char **params,
-		  size_t param_count)
+ver_cmd(MsnServConn *servconn, const char *command, const char **params,
+		size_t param_count)
 {
 	GaimConnection *gc = servconn->session->account->gc;
 	size_t i;
@@ -57,8 +57,8 @@
 }
 
 static gboolean
-__inf_cmd(MsnServConn *servconn, const char *command, const char **params,
-		  size_t param_count)
+inf_cmd(MsnServConn *servconn, const char *command, const char **params,
+		size_t param_count)
 {
 	GaimAccount *account = servconn->session->account;
 	GaimConnection *gc = gaim_account_get_connection(account);
@@ -86,8 +86,8 @@
 }
 
 static gboolean
-__xfr_cmd(MsnServConn *servconn, const char *command, const char **params,
-		  size_t param_count)
+xfr_cmd(MsnServConn *servconn, const char *command, const char **params,
+		size_t param_count)
 {
 	MsnSession *session = servconn->session;
 	GaimConnection *gc = servconn->session->account->gc;
@@ -130,8 +130,8 @@
 }
 
 static gboolean
-__unknown_cmd(MsnServConn *servconn, const char *command, const char **params,
-			  size_t param_count)
+unknown_cmd(MsnServConn *servconn, const char *command, const char **params,
+			size_t param_count)
 {
 	GaimConnection *gc = servconn->session->account->gc;
 
@@ -150,7 +150,7 @@
 }
 
 static gboolean
-__connect_cb(gpointer data, gint source, GaimInputCondition cond)
+connect_cb(gpointer data, gint source, GaimInputCondition cond)
 {
 	MsnServConn *dispatch = data;
 	MsnSession *session = dispatch->session;
@@ -179,7 +179,7 @@
 }
 
 static void
-__failed_read_cb(gpointer data, gint source, GaimInputCondition cond)
+failed_read_cb(gpointer data, gint source, GaimInputCondition cond)
 {
 	MsnServConn *dispatch = data;
 	GaimConnection *gc;
@@ -197,15 +197,15 @@
 	dispatch = msn_servconn_new(session);
 	
 	msn_servconn_set_server(dispatch, server, port);
-	msn_servconn_set_connect_cb(dispatch, __connect_cb);
-	msn_servconn_set_failed_read_cb(dispatch, __failed_read_cb);
+	msn_servconn_set_connect_cb(dispatch, connect_cb);
+	msn_servconn_set_failed_read_cb(dispatch, failed_read_cb);
 
 	if (dispatch_commands == NULL) {
 		/* Register the command callbacks. */
-		msn_servconn_register_command(dispatch, "VER",       __ver_cmd);
-		msn_servconn_register_command(dispatch, "INF",       __inf_cmd);
-		msn_servconn_register_command(dispatch, "XFR",       __xfr_cmd);
-		msn_servconn_register_command(dispatch, "_unknown_", __unknown_cmd);
+		msn_servconn_register_command(dispatch, "VER",       ver_cmd);
+		msn_servconn_register_command(dispatch, "INF",       inf_cmd);
+		msn_servconn_register_command(dispatch, "XFR",       xfr_cmd);
+		msn_servconn_register_command(dispatch, "_unknown_", unknown_cmd);
 
 		/* Save this for future use. */
 		dispatch_commands = dispatch->commands;
--- a/src/protocols/msn/msn.c	Sat Jun 07 06:09:02 2003 +0000
+++ b/src/protocols/msn/msn.c	Sat Jun 07 06:41:31 2003 +0000
@@ -112,19 +112,19 @@
 }
 
 static void
-__enable_msn_pages_cb(GaimConnection *gc)
+enable_msn_pages_cb(GaimConnection *gc)
 {
 	msn_set_prp(gc, "MOB", "Y");
 }
 
 static void
-__disable_msn_pages_cb(GaimConnection *gc)
+disable_msn_pages_cb(GaimConnection *gc)
 {
 	msn_set_prp(gc, "MOB", "N");
 }
 
 static void
-__send_to_mobile_cb(MsnMobileData *data, const char *entry)
+send_to_mobile_cb(MsnMobileData *data, const char *entry)
 {
 	MsnSession *session = data->gc->proto_data;
 	MsnServConn *servconn = session->notification_conn;
@@ -153,7 +153,7 @@
 }
 
 static void
-__close_mobile_page_cb(MsnMobileData *data, const char *entry)
+close_mobile_page_cb(MsnMobileData *data, const char *entry)
 {
 	g_free(data);
 }
@@ -212,13 +212,13 @@
 						  "your buddy list to send you MSN Mobile pages "
 						  "to your cell phone or other mobile device?"),
 						-1, gc, 3,
-						_("Allow"), G_CALLBACK(__enable_msn_pages_cb),
-						_("Disallow"), G_CALLBACK(__disable_msn_pages_cb),
+						_("Allow"), G_CALLBACK(enable_msn_pages_cb),
+						_("Disallow"), G_CALLBACK(disable_msn_pages_cb),
 						_("Cancel"), NULL);
 }
 
 static void
-__show_send_to_mobile_cb(GaimConnection *gc, const char *passport)
+show_send_to_mobile_cb(GaimConnection *gc, const char *passport)
 {
 	MsnUser *user;
 	MsnSession *session = gc->proto_data;
@@ -232,8 +232,8 @@
 
 	gaim_request_input(gc, NULL, _("Send a mobile message."), NULL,
 					   NULL, TRUE,
-					   _("Page"), G_CALLBACK(__send_to_mobile_cb),
-					   _("Close"), G_CALLBACK(__close_mobile_page_cb),
+					   _("Page"), G_CALLBACK(send_to_mobile_cb),
+					   _("Close"), G_CALLBACK(close_mobile_page_cb),
 					   data);
 }
 
@@ -385,7 +385,7 @@
 		if (user->mobile) {
 			pbm = g_new0(struct proto_buddy_menu, 1);
 			pbm->label    = _("Send to Mobile");
-			pbm->callback = __show_send_to_mobile_cb;
+			pbm->callback = show_send_to_mobile_cb;
 			pbm->gc       = gc;
 			m = g_list_append(m, pbm);
 		}
@@ -1209,7 +1209,7 @@
 };
 
 static void
-__init_plugin(GaimPlugin *plugin)
+init_plugin(GaimPlugin *plugin)
 {
 	GaimAccountOption *option;
 
@@ -1229,4 +1229,4 @@
 	gaim_prefs_add_bool("/plugins/prpl/msn/conv_timeout_notice", TRUE);
 }
 
-GAIM_INIT_PLUGIN(msn, __init_plugin, info);
+GAIM_INIT_PLUGIN(msn, init_plugin, info);
--- a/src/protocols/msn/notification.c	Sat Jun 07 06:09:02 2003 +0000
+++ b/src/protocols/msn/notification.c	Sat Jun 07 06:41:31 2003 +0000
@@ -39,7 +39,7 @@
  * Utility functions
  **************************************************************************/
 static gboolean
-__add_buddy(MsnServConn *servconn, MsnUser *user)
+add_buddy(MsnServConn *servconn, MsnUser *user)
 {
 	MsnSession *session = servconn->session;
 	GaimConnection *gc = session->account->gc;
@@ -170,15 +170,15 @@
  * Catch-all commands
  **************************************************************************/
 static gboolean
-__blank_cmd(MsnServConn *servconn, const char *command, const char **params,
-			size_t param_count)
+blank_cmd(MsnServConn *servconn, const char *command, const char **params,
+		  size_t param_count)
 {
 	return TRUE;
 }
 
 static gboolean
-__unknown_cmd(MsnServConn *servconn, const char *command, const char **params,
-			  size_t param_count)
+unknown_cmd(MsnServConn *servconn, const char *command, const char **params,
+			size_t param_count)
 {
 	char buf[MSN_BUF_LEN];
 
@@ -211,8 +211,8 @@
  * Login
  **************************************************************************/
 static gboolean
-__ver_cmd(MsnServConn *servconn, const char *command, const char **params,
-		  size_t param_count)
+ver_cmd(MsnServConn *servconn, const char *command, const char **params,
+		size_t param_count)
 {
 	GaimConnection *gc = servconn->session->account->gc;
 	size_t i;
@@ -241,8 +241,8 @@
 }
 
 static gboolean
-__inf_cmd(MsnServConn *servconn, const char *command, const char **params,
-		  size_t param_count)
+inf_cmd(MsnServConn *servconn, const char *command, const char **params,
+		size_t param_count)
 {
 	GaimAccount *account = servconn->session->account;
 	GaimConnection *gc = gaim_account_get_connection(account);
@@ -270,8 +270,8 @@
 }
 
 static gboolean
-__usr_cmd(MsnServConn *servconn, const char *command, const char **params,
-		  size_t param_count)
+usr_cmd(MsnServConn *servconn, const char *command, const char **params,
+		size_t param_count)
 {
 	MsnSession *session = servconn->session;
 	GaimAccount *account = session->account;
@@ -336,8 +336,8 @@
  * Log out
  **************************************************************************/
 static gboolean
-__out_cmd(MsnServConn *servconn, const char *command, const char **params,
-		  size_t param_count)
+out_cmd(MsnServConn *servconn, const char *command, const char **params,
+		size_t param_count)
 {
 	GaimConnection *gc = servconn->session->account->gc;
 
@@ -359,8 +359,8 @@
  * Messages
  **************************************************************************/
 static gboolean
-__msg_cmd(MsnServConn *servconn, const char *command, const char **params,
-		  size_t param_count)
+msg_cmd(MsnServConn *servconn, const char *command, const char **params,
+		size_t param_count)
 {
 	gaim_debug(GAIM_DEBUG_INFO, "msn", "Found message. Parsing.\n");
 
@@ -376,8 +376,8 @@
  * Challenges
  **************************************************************************/
 static gboolean
-__chl_cmd(MsnServConn *servconn, const char *command, const char **params,
-		  size_t param_count)
+chl_cmd(MsnServConn *servconn, const char *command, const char **params,
+		size_t param_count)
 {
 	GaimConnection *gc = servconn->session->account->gc;
 	char buf[MSN_BUF_LEN];
@@ -412,8 +412,8 @@
  * Buddy Lists
  **************************************************************************/
 static gboolean
-__add_cmd(MsnServConn *servconn, const char *command, const char **params,
-		  size_t param_count)
+add_cmd(MsnServConn *servconn, const char *command, const char **params,
+		size_t param_count)
 {
 	MsnSession *session = servconn->session;
 	MsnUser *user;
@@ -435,7 +435,7 @@
 
 		msn_user_set_group_id(user, atoi(params[5]));
 
-		__add_buddy(servconn, user);
+		add_buddy(servconn, user);
 
 		return TRUE;
 	}
@@ -465,8 +465,8 @@
 }
 
 static gboolean
-__adg_cmd(MsnServConn *servconn, const char *command, const char **params,
-		  size_t param_count)
+adg_cmd(MsnServConn *servconn, const char *command, const char **params,
+		size_t param_count)
 {
 	MsnGroup *group;
 	MsnSession *session = servconn->session;
@@ -485,8 +485,8 @@
 }
 
 static gboolean
-__blp_cmd(MsnServConn *servconn, const char *command, const char **params,
-		  size_t param_count)
+blp_cmd(MsnServConn *servconn, const char *command, const char **params,
+		size_t param_count)
 {
 	GaimConnection *gc = servconn->session->account->gc;
 
@@ -512,8 +512,8 @@
 }
 
 static gboolean
-__bpr_cmd(MsnServConn *servconn, const char *command, const char **params,
-		  size_t param_count)
+bpr_cmd(MsnServConn *servconn, const char *command, const char **params,
+		size_t param_count)
 {
 	MsnSession *session = servconn->session;
 	GaimConnection *gc = session->account->gc;
@@ -552,8 +552,8 @@
 }
 
 static gboolean
-__fln_cmd(MsnServConn *servconn, const char *command, const char **params,
-		  size_t param_count)
+fln_cmd(MsnServConn *servconn, const char *command, const char **params,
+		size_t param_count)
 {
 	GaimConnection *gc = servconn->session->account->gc;
 
@@ -563,8 +563,8 @@
 }
 
 static gboolean
-__iln_cmd(MsnServConn *servconn, const char *command, const char **params,
-		  size_t param_count)
+iln_cmd(MsnServConn *servconn, const char *command, const char **params,
+		size_t param_count)
 {
 	GaimConnection *gc = servconn->session->account->gc;
 	int status = 0;
@@ -599,8 +599,8 @@
 }
 
 static gboolean
-__lsg_cmd(MsnServConn *servconn, const char *command, const char **params,
-		  size_t param_count)
+lsg_cmd(MsnServConn *servconn, const char *command, const char **params,
+		size_t param_count)
 {
 	MsnSession *session = servconn->session;
 	MsnGroup *group;
@@ -632,8 +632,8 @@
 }
 
 static gboolean
-__lst_cmd(MsnServConn *servconn, const char *command, const char **params,
-		  size_t param_count)
+lst_cmd(MsnServConn *servconn, const char *command, const char **params,
+		size_t param_count)
 {
 	MsnSession *session = servconn->session;
 	GaimConnection *gc = session->account->gc;
@@ -760,7 +760,7 @@
 			session->lists.forward = g_slist_remove(session->lists.forward,
 													user);
 
-			__add_buddy(servconn, user);
+			add_buddy(servconn, user);
 		}
 
 		session->syncing_lists = FALSE;
@@ -771,8 +771,8 @@
 }
 
 static gboolean
-__nln_cmd(MsnServConn *servconn, const char *command, const char **params,
-		  size_t param_count)
+nln_cmd(MsnServConn *servconn, const char *command, const char **params,
+		size_t param_count)
 {
 	MsnSession *session = servconn->session;
 	GaimConnection *gc = session->account->gc;
@@ -806,8 +806,8 @@
 }
 
 static gboolean
-__prp_cmd(MsnServConn *servconn, const char *command, const char **params,
-		  size_t param_count)
+prp_cmd(MsnServConn *servconn, const char *command, const char **params,
+		size_t param_count)
 {
 	MsnSession *session = servconn->session;
 	const char *type, *value;
@@ -828,8 +828,8 @@
 }
 
 static gboolean
-__rea_cmd(MsnServConn *servconn, const char *command, const char **params,
-		  size_t param_count)
+rea_cmd(MsnServConn *servconn, const char *command, const char **params,
+		size_t param_count)
 {
 	MsnSession *session = servconn->session;
 	GaimConnection *gc = session->account->gc;
@@ -843,8 +843,8 @@
 }
 
 static gboolean
-__reg_cmd(MsnServConn *servconn, const char *command, const char **params,
-		  size_t param_count)
+reg_cmd(MsnServConn *servconn, const char *command, const char **params,
+		size_t param_count)
 {
 	MsnSession *session = servconn->session;
 	MsnGroup *group;
@@ -867,8 +867,8 @@
 }
 
 static gboolean
-__rem_cmd(MsnServConn *servconn, const char *command, const char **params,
-		  size_t param_count)
+rem_cmd(MsnServConn *servconn, const char *command, const char **params,
+		size_t param_count)
 {
 	MsnSession *session = servconn->session;
 
@@ -936,8 +936,8 @@
 }
 
 static gboolean
-__rmg_cmd(MsnServConn *servconn, const char *command, const char **params,
-		  size_t param_count)
+rmg_cmd(MsnServConn *servconn, const char *command, const char **params,
+		size_t param_count)
 {
 	MsnSession *session = servconn->session;
 	MsnGroup *group;
@@ -954,8 +954,8 @@
  * Misc commands
  **************************************************************************/
 static gboolean
-__url_cmd(MsnServConn *servconn, const char *command, const char **params,
-		  size_t param_count)
+url_cmd(MsnServConn *servconn, const char *command, const char **params,
+		size_t param_count)
 {
 	MsnSession *session = servconn->session;
 	GaimAccount *account = session->account;
@@ -1068,8 +1068,8 @@
  * Switchboards
  **************************************************************************/
 static gboolean
-__rng_cmd(MsnServConn *servconn, const char *command, const char **params,
-		  size_t param_count)
+rng_cmd(MsnServConn *servconn, const char *command, const char **params,
+		size_t param_count)
 {
 	MsnSession *session = servconn->session;
 	MsnSwitchBoard *swboard;
@@ -1114,8 +1114,8 @@
 }
 
 static gboolean
-__xfr_cmd(MsnServConn *servconn, const char *command, const char **params,
-		  size_t param_count)
+xfr_cmd(MsnServConn *servconn, const char *command, const char **params,
+		size_t param_count)
 {
 	MsnSession *session = servconn->session;
 	MsnSwitchBoard *swboard;
@@ -1183,7 +1183,7 @@
  * Message Types
  **************************************************************************/
 static gboolean
-__profile_msg(MsnServConn *servconn, MsnMessage *msg)
+profile_msg(MsnServConn *servconn, MsnMessage *msg)
 {
 	MsnSession *session = servconn->session;
 	const char *value;
@@ -1206,7 +1206,7 @@
 }
 
 static gboolean
-__initial_email_msg(MsnServConn *servconn, MsnMessage *msg)
+initial_email_msg(MsnServConn *servconn, MsnMessage *msg)
 {
 	MsnSession *session = servconn->session;
 	GaimConnection *gc = session->account->gc;
@@ -1247,7 +1247,7 @@
 }
 
 static gboolean
-__email_msg(MsnServConn *servconn, MsnMessage *msg)
+email_msg(MsnServConn *servconn, MsnMessage *msg)
 {
 	MsnSession *session = servconn->session;
 	GaimConnection *gc = session->account->gc;
@@ -1284,7 +1284,7 @@
 }
 
 static gboolean
-__system_msg(MsnServConn *servconn, MsnMessage *msg)
+system_msg(MsnServConn *servconn, MsnMessage *msg)
 {
 	GHashTable *table;
 	const char *type_s;
@@ -1323,8 +1323,9 @@
 
 	return TRUE;
 }
+
 static gboolean
-__connect_cb(gpointer data, gint source, GaimInputCondition cond)
+connect_cb(gpointer data, gint source, GaimInputCondition cond)
 {
 	MsnServConn *notification = data;
 	MsnSession *session = notification->session;
@@ -1355,7 +1356,7 @@
 }
 
 static void
-__failed_read_cb(gpointer data, gint source, GaimInputCondition cond)
+failed_read_cb(gpointer data, gint source, GaimInputCondition cond)
 {
 	MsnServConn *notification = data;
 	GaimConnection *gc;
@@ -1373,53 +1374,53 @@
 	notification = msn_servconn_new(session);
 
 	msn_servconn_set_server(notification, server, port);
-	msn_servconn_set_connect_cb(notification, __connect_cb);
-	msn_servconn_set_failed_read_cb(notification, __failed_read_cb);
+	msn_servconn_set_connect_cb(notification, connect_cb);
+	msn_servconn_set_failed_read_cb(notification, failed_read_cb);
 
 	if (notification_commands == NULL) {
 		/* Register the command callbacks. */
-		msn_servconn_register_command(notification, "ADD",       __add_cmd);
-		msn_servconn_register_command(notification, "ADG",       __adg_cmd);
-		msn_servconn_register_command(notification, "BLP",       __blp_cmd);
-		msn_servconn_register_command(notification, "BPR",       __bpr_cmd);
-		msn_servconn_register_command(notification, "CHG",       __blank_cmd);
-		msn_servconn_register_command(notification, "CHL",       __chl_cmd);
-		msn_servconn_register_command(notification, "FLN",       __fln_cmd);
-		msn_servconn_register_command(notification, "GTC",       __blank_cmd);
-		msn_servconn_register_command(notification, "ILN",       __iln_cmd);
-		msn_servconn_register_command(notification, "INF",       __inf_cmd);
-		msn_servconn_register_command(notification, "LSG",       __lsg_cmd);
-		msn_servconn_register_command(notification, "LST",       __lst_cmd);
-		msn_servconn_register_command(notification, "MSG",       __msg_cmd);
-		msn_servconn_register_command(notification, "NLN",       __nln_cmd);
-		msn_servconn_register_command(notification, "OUT",       __out_cmd);
-		msn_servconn_register_command(notification, "PRP",       __prp_cmd);
-		msn_servconn_register_command(notification, "QNG",       __blank_cmd);
-		msn_servconn_register_command(notification, "QRY",       __blank_cmd);
-		msn_servconn_register_command(notification, "REA",       __rea_cmd);
-		msn_servconn_register_command(notification, "REG",       __reg_cmd);
-		msn_servconn_register_command(notification, "REM",       __rem_cmd);
-		msn_servconn_register_command(notification, "RMG",       __rmg_cmd);
-		msn_servconn_register_command(notification, "RNG",       __rng_cmd);
-		msn_servconn_register_command(notification, "SYN",       __blank_cmd);
-		msn_servconn_register_command(notification, "URL",       __url_cmd);
-		msn_servconn_register_command(notification, "USR",       __usr_cmd);
-		msn_servconn_register_command(notification, "VER",       __ver_cmd);
-		msn_servconn_register_command(notification, "XFR",       __xfr_cmd);
-		msn_servconn_register_command(notification, "_unknown_", __unknown_cmd);
+		msn_servconn_register_command(notification, "ADD",       add_cmd);
+		msn_servconn_register_command(notification, "ADG",       adg_cmd);
+		msn_servconn_register_command(notification, "BLP",       blp_cmd);
+		msn_servconn_register_command(notification, "BPR",       bpr_cmd);
+		msn_servconn_register_command(notification, "CHG",       blank_cmd);
+		msn_servconn_register_command(notification, "CHL",       chl_cmd);
+		msn_servconn_register_command(notification, "FLN",       fln_cmd);
+		msn_servconn_register_command(notification, "GTC",       blank_cmd);
+		msn_servconn_register_command(notification, "ILN",       iln_cmd);
+		msn_servconn_register_command(notification, "INF",       inf_cmd);
+		msn_servconn_register_command(notification, "LSG",       lsg_cmd);
+		msn_servconn_register_command(notification, "LST",       lst_cmd);
+		msn_servconn_register_command(notification, "MSG",       msg_cmd);
+		msn_servconn_register_command(notification, "NLN",       nln_cmd);
+		msn_servconn_register_command(notification, "OUT",       out_cmd);
+		msn_servconn_register_command(notification, "PRP",       prp_cmd);
+		msn_servconn_register_command(notification, "QNG",       blank_cmd);
+		msn_servconn_register_command(notification, "QRY",       blank_cmd);
+		msn_servconn_register_command(notification, "REA",       rea_cmd);
+		msn_servconn_register_command(notification, "REG",       reg_cmd);
+		msn_servconn_register_command(notification, "REM",       rem_cmd);
+		msn_servconn_register_command(notification, "RMG",       rmg_cmd);
+		msn_servconn_register_command(notification, "RNG",       rng_cmd);
+		msn_servconn_register_command(notification, "SYN",       blank_cmd);
+		msn_servconn_register_command(notification, "URL",       url_cmd);
+		msn_servconn_register_command(notification, "USR",       usr_cmd);
+		msn_servconn_register_command(notification, "VER",       ver_cmd);
+		msn_servconn_register_command(notification, "XFR",       xfr_cmd);
+		msn_servconn_register_command(notification, "_unknown_", unknown_cmd);
 
 		/* Register the message type callbacks. */
 		msn_servconn_register_msg_type(notification, "text/x-msmsgsprofile",
-									   __profile_msg);
+									   profile_msg);
 		msn_servconn_register_msg_type(notification,
 									   "text/x-msmsgsinitialemailnotification",
-									   __initial_email_msg);
+									   initial_email_msg);
 		msn_servconn_register_msg_type(notification,
 									   "text/x-msmsgsemailnotification",
-									   __email_msg);
+									   email_msg);
 		msn_servconn_register_msg_type(notification,
 									   "application/x-msmsgssystemmessage",
-									   __system_msg);
+									   system_msg);
 
 		/* Save these for future use. */
 		notification_commands  = notification->commands;
--- a/src/protocols/msn/servconn.c	Sat Jun 07 06:09:02 2003 +0000
+++ b/src/protocols/msn/servconn.c	Sat Jun 07 06:41:31 2003 +0000
@@ -30,7 +30,7 @@
 } MsnQueueEntry;
 
 static gboolean
-__process_message(MsnServConn *servconn, MsnMessage *msg)
+process_message(MsnServConn *servconn, MsnMessage *msg)
 {
 	MsnServConnMsgCb cb;
 
@@ -52,7 +52,7 @@
 }
 
 static gboolean
-__process_single_line(MsnServConn *servconn, char *str)
+process_single_line(MsnServConn *servconn, char *str)
 {
 	MsnServConnCommandCb cb;
 	GSList *l, *l_next;
@@ -120,7 +120,7 @@
 			servconn->msg_passport = g_strdup(msn_user_get_passport(sender));
 			servconn->msg_friendly = g_strdup(msn_user_get_name(sender));
 
-			__process_message(servconn, msg);
+			process_message(servconn, msg);
 
 			g_free(servconn->msg_passport);
 			g_free(servconn->msg_friendly);
@@ -136,7 +136,7 @@
 }
 
 static gboolean
-__process_multi_line(MsnServConn *servconn, char *buffer)
+process_multi_line(MsnServConn *servconn, char *buffer)
 {
 	MsnMessage *msg;
 	char msg_str[MSN_BUF_LEN];
@@ -152,7 +152,7 @@
 
 	msg = msn_message_new_from_str(servconn->session, msg_str);
 
-	result = __process_message(servconn, msg);
+	result = process_message(servconn, msg);
 
 	msn_message_destroy(msg);
 
@@ -160,7 +160,7 @@
 }
 
 static void
-__connect_cb(gpointer data, gint source, GaimInputCondition cond)
+connect_cb(gpointer data, gint source, GaimInputCondition cond)
 {
 	MsnServConn *servconn = data;
 
@@ -200,7 +200,7 @@
 	g_return_val_if_fail(!servconn->connected, TRUE);
 
 	i = gaim_proxy_connect(servconn->session->account, servconn->server,
-					  servconn->port, __connect_cb, servconn);
+					  servconn->port, connect_cb, servconn);
 
 	if (i == 0)
 		servconn->connected = TRUE;
@@ -452,7 +452,7 @@
 			msg[servconn->msg_len] = '\0';
 			servconn->parsing_msg = FALSE;
 
-			__process_multi_line(servconn, msg);
+			process_multi_line(servconn, msg);
 
 			servconn->msg_len = 0;
 			g_free(servconn->msg_passport);
@@ -492,7 +492,7 @@
 
 			g_strchomp(cmd);
 
-			cont = __process_single_line(servconn, cmd);
+			cont = process_single_line(servconn, cmd);
 
 			g_free(cmd);
 		}
--- a/src/protocols/msn/switchboard.c	Sat Jun 07 06:09:02 2003 +0000
+++ b/src/protocols/msn/switchboard.c	Sat Jun 07 06:41:31 2003 +0000
@@ -31,7 +31,7 @@
  * Utility functions
  **************************************************************************/
 static gboolean
-__send_clientcaps(MsnSwitchBoard *swboard)
+send_clientcaps(MsnSwitchBoard *swboard)
 {
 	MsnMessage *msg;
 
@@ -61,15 +61,15 @@
  * Catch-all commands
  **************************************************************************/
 static gboolean
-__blank_cmd(MsnServConn *servconn, const char *command, const char **params,
-			size_t param_count)
+blank_cmd(MsnServConn *servconn, const char *command, const char **params,
+		   size_t param_count)
 {
 	return TRUE;
 }
 
 static gboolean
-__unknown_cmd(MsnServConn *servconn, const char *command, const char **params,
-			  size_t param_count)
+unknown_cmd(MsnServConn *servconn, const char *command, const char **params,
+			 size_t param_count)
 {
 	gaim_debug(GAIM_DEBUG_ERROR, "msg",
 			   "Handled switchboard message: %s\n", command);
@@ -81,8 +81,8 @@
  * Switchboard Commands
  **************************************************************************/
 static gboolean
-__ans_cmd(MsnServConn *servconn, const char *command, const char **params,
-		  size_t param_count)
+ans_cmd(MsnServConn *servconn, const char *command, const char **params,
+		 size_t param_count)
 {
 	GaimAccount *account = servconn->session->account;
 	MsnSwitchBoard *swboard = servconn->data;
@@ -91,12 +91,12 @@
 		gaim_chat_add_user(GAIM_CHAT(swboard->chat),
 						   gaim_account_get_username(account), NULL);
 
-	return __send_clientcaps(swboard);
+	return send_clientcaps(swboard);
 }
 
 static gboolean
-__bye_cmd(MsnServConn *servconn, const char *command, const char **params,
-		  size_t param_count)
+bye_cmd(MsnServConn *servconn, const char *command, const char **params,
+		 size_t param_count)
 {
 	GaimConnection *gc = servconn->session->account->gc;
 	MsnSwitchBoard *swboard = servconn->data;
@@ -149,8 +149,8 @@
 }
 
 static gboolean
-__iro_cmd(MsnServConn *servconn, const char *command, const char **params,
-		  size_t param_count)
+iro_cmd(MsnServConn *servconn, const char *command, const char **params,
+		 size_t param_count)
 {
 	GaimAccount *account = servconn->session->account;
 	GaimConnection *gc = account->gc;
@@ -174,8 +174,8 @@
 }
 
 static gboolean
-__joi_cmd(MsnServConn *servconn, const char *command, const char **params,
-		  size_t param_count)
+joi_cmd(MsnServConn *servconn, const char *command, const char **params,
+		 size_t param_count)
 {
 	GaimAccount *account = servconn->session->account;
 	GaimConnection *gc = account->gc;
@@ -212,12 +212,12 @@
 		}
 	}
 
-	return __send_clientcaps(swboard);
+	return send_clientcaps(swboard);
 }
 
 static gboolean
-__msg_cmd(MsnServConn *servconn, const char *command, const char **params,
-		  size_t param_count)
+msg_cmd(MsnServConn *servconn, const char *command, const char **params,
+		 size_t param_count)
 {
 	gaim_debug(GAIM_DEBUG_INFO, "msn", "Found message. Parsing.\n");
 
@@ -230,8 +230,8 @@
 }
 
 static gboolean
-__nak_cmd(MsnServConn *servconn, const char *command, const char **params,
-		  size_t param_count)
+nak_cmd(MsnServConn *servconn, const char *command, const char **params,
+		 size_t param_count)
 {
 	/*
 	 * TODO: Investigate this, as it seems to occur frequently with
@@ -244,8 +244,8 @@
 }
 
 static gboolean
-__out_cmd(MsnServConn *servconn, const char *command, const char **params,
-		  size_t param_count)
+out_cmd(MsnServConn *servconn, const char *command, const char **params,
+		 size_t param_count)
 {
 	GaimConnection *gc = servconn->session->account->gc;
 	MsnSwitchBoard *swboard = servconn->data;
@@ -259,8 +259,8 @@
 }
 
 static gboolean
-__usr_cmd(MsnServConn *servconn, const char *command, const char **params,
-		  size_t param_count)
+usr_cmd(MsnServConn *servconn, const char *command, const char **params,
+		 size_t param_count)
 {
 	MsnSwitchBoard *swboard = servconn->data;
 
@@ -278,7 +278,7 @@
  * Message Types
  **************************************************************************/
 static gboolean
-__plain_msg(MsnServConn *servconn, MsnMessage *msg)
+plain_msg(MsnServConn *servconn, MsnMessage *msg)
 {
 	GaimConnection *gc = servconn->session->account->gc;
 	MsnSwitchBoard *swboard = servconn->data;
@@ -317,7 +317,7 @@
 }
 
 static gboolean
-__control_msg(MsnServConn *servconn, MsnMessage *msg)
+control_msg(MsnServConn *servconn, MsnMessage *msg)
 {
 	GaimConnection *gc = servconn->session->account->gc;
 	MsnSwitchBoard *swboard = servconn->data;
@@ -334,7 +334,7 @@
 }
 
 static gboolean
-__clientcaps_msg(MsnServConn *servconn, MsnMessage *msg)
+clientcaps_msg(MsnServConn *servconn, MsnMessage *msg)
 {
 	MsnSession *session = servconn->session;
 	MsnSwitchBoard *swboard = servconn->data;
@@ -356,7 +356,7 @@
  * Connect stuff
  **************************************************************************/
 static gboolean
-__connect_cb(gpointer data, gint source, GaimInputCondition cond)
+connect_cb(gpointer data, gint source, GaimInputCondition cond)
 {
 	MsnServConn *servconn = data;
 	GaimAccount *account = servconn->session->account;
@@ -396,7 +396,7 @@
 }
 
 static void
-__failed_read_cb(gpointer data, gint source, GaimInputCondition cond)
+failed_read_cb(gpointer data, gint source, GaimInputCondition cond)
 {
 	MsnServConn *servconn = data;
 
@@ -414,8 +414,8 @@
 	swboard = g_new0(MsnSwitchBoard, 1);
 
 	swboard->servconn = servconn = msn_servconn_new(session);
-	msn_servconn_set_connect_cb(servconn, __connect_cb);
-	msn_servconn_set_failed_read_cb(servconn, __failed_read_cb);
+	msn_servconn_set_connect_cb(servconn, connect_cb);
+	msn_servconn_set_failed_read_cb(servconn, failed_read_cb);
 
 	servconn->data = swboard;
 
@@ -423,27 +423,27 @@
 
 	if (switchboard_commands == NULL) {
 		/* Register the command callbacks. */
-		msn_servconn_register_command(servconn, "ACK",       __blank_cmd);
-		msn_servconn_register_command(servconn, "ANS",       __ans_cmd);
-		msn_servconn_register_command(servconn, "BYE",       __bye_cmd);
-		msn_servconn_register_command(servconn, "CAL",       __blank_cmd);
-		msn_servconn_register_command(servconn, "IRO",       __iro_cmd);
-		msn_servconn_register_command(servconn, "JOI",       __joi_cmd);
-		msn_servconn_register_command(servconn, "MSG",       __msg_cmd);
-		msn_servconn_register_command(servconn, "NAK",       __nak_cmd);
-		msn_servconn_register_command(servconn, "NLN",       __blank_cmd);
-		msn_servconn_register_command(servconn, "OUT",       __out_cmd);
-		msn_servconn_register_command(servconn, "USR",       __usr_cmd);
-		msn_servconn_register_command(servconn, "_unknown_", __unknown_cmd);
+		msn_servconn_register_command(servconn, "ACK",      blank_cmd);
+		msn_servconn_register_command(servconn, "ANS",      ans_cmd);
+		msn_servconn_register_command(servconn, "BYE",      bye_cmd);
+		msn_servconn_register_command(servconn, "CAL",      blank_cmd);
+		msn_servconn_register_command(servconn, "IRO",      iro_cmd);
+		msn_servconn_register_command(servconn, "JOI",      joi_cmd);
+		msn_servconn_register_command(servconn, "MSG",      msg_cmd);
+		msn_servconn_register_command(servconn, "NAK",      nak_cmd);
+		msn_servconn_register_command(servconn, "NLN",      blank_cmd);
+		msn_servconn_register_command(servconn, "OUT",      out_cmd);
+		msn_servconn_register_command(servconn, "USR",      usr_cmd);
+		msn_servconn_register_command(servconn, "_unknown_",unknown_cmd);
 
 		/* Register the message type callbacks. */
-		msn_servconn_register_msg_type(servconn, "text/plain", __plain_msg);
+		msn_servconn_register_msg_type(servconn, "text/plain",plain_msg);
 		msn_servconn_register_msg_type(servconn, "text/x-msmsgscontrol",
-									   __control_msg);
+									  control_msg);
 		msn_servconn_register_msg_type(servconn, "text/x-clientcaps",
-									   __clientcaps_msg);
+									  clientcaps_msg);
 		msn_servconn_register_msg_type(servconn, "text/x-clientinfo",
-									   __clientcaps_msg);
+									  clientcaps_msg);
 		msn_servconn_register_msg_type(servconn, "application/x-buddyicon",
 									   msn_buddy_icon_msg);