# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1172187159 0
# Node ID cad32dba756b9d313ce4813f08ebc9d4085c03b6
# Parent  5ec709327dc6228555df707ffdf00f08541af2ee
Automatically format screenname to account->username

diff -r 5ec709327dc6 -r cad32dba756b libpurple/protocols/oscar/oscar.c
--- a/libpurple/protocols/oscar/oscar.c	Thu Feb 22 20:33:51 2007 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Thu Feb 22 23:32:39 2007 +0000
@@ -201,6 +201,7 @@
 void oscar_set_info(GaimConnection *gc, const char *info);
 static void oscar_set_info_and_status(GaimAccount *account, gboolean setinfo, const char *rawinfo, gboolean setstatus, GaimStatus *status);
 static void oscar_set_extendedstatus(GaimConnection *gc);
+static void oscar_format_screenname(GaimConnection *gc, const char *nick); 
 static gboolean gaim_ssi_rerequestdata(gpointer data);
 
 static void oscar_free_name_data(struct name_data *data) {
@@ -3591,6 +3592,8 @@
 	if (gaim_account_get_user_info(account) != NULL)
 		serv_set_info(gc, gaim_account_get_user_info(account));
 
+	oscar_format_screenname(gc, account->username);
+
 	/* Set our available message based on the current status */
 	status = gaim_account_get_active_status(account);
 	if (gaim_status_is_available(status))
@@ -4006,12 +4009,6 @@
 		return 1;
 	}
 
-	if (sn != NULL) {
-		char *dialog_msg = g_strdup_printf(_("Your screen name is currently formatted as follows:\n%s"), sn);
-		gaim_notify_info(gc, NULL, _("Account Info"), dialog_msg);
-		g_free(dialog_msg);
-	}
-
 	if (email != NULL) {
 		char *dialog_msg = g_strdup_printf(_("The e-mail address for %s is %s"),
 						   gaim_account_get_username(gaim_connection_get_account(gc)), email);
@@ -6034,16 +6031,6 @@
 	}
 }
 
-static void oscar_show_format_screenname(GaimPluginAction *action)
-{
-	GaimConnection *gc = (GaimConnection *) action->context;
-	gaim_request_input(gc, NULL, _("New screen name formatting:"), NULL,
-					   gaim_connection_get_display_name(gc), FALSE, FALSE, NULL,
-					   _("_OK"), G_CALLBACK(oscar_format_screenname),
-					   _("_Cancel"), NULL,
-					   gc);
-}
-
 static void oscar_confirm_account(GaimPluginAction *action)
 {
 	GaimConnection *gc;
@@ -6365,10 +6352,6 @@
 	else
 	{
 		/* AIM actions */
-		act = gaim_plugin_action_new(_("Format Screen Name..."),
-				oscar_show_format_screenname);
-		menu = g_list_prepend(menu, act);
-
 		act = gaim_plugin_action_new(_("Confirm Account"),
 				oscar_confirm_account);
 		menu = g_list_prepend(menu, act);