[Gaim-commits] CVS: gaim/src/protocols/msn msn.c,1.235,1.236

[Nathan W. <fac...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/msn
In directory sc8-pr-cvs1:/tmp/cvs-serv21452/src/protocols/msn

Modified Files:
	msn.c 
Log Message:
prpl-specific normalize is back, after my crusade to kill it.


Index: msn.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/msn.c,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -d -p -r1.235 -r1.236
--- msn.c	9 Oct 2003 00:03:18 -0000	1.235
+++ msn.c	14 Oct 2003 05:07:38 -0000	1.236
@@ -36,7 +36,7 @@
 
 static GaimPlugin *my_protocol = NULL;
 
-static char *msn_normalize(const char *str);
+static const char *msn_normalize(const GaimAccount *account, const char *str);
 
 typedef struct
 {
@@ -461,7 +461,7 @@ msn_login(GaimAccount *account)
 	gaim_connection_update_progress(gc, _("Connecting"), 0, MSN_CONNECT_STEPS);
 
 	/* Hmm, I don't like this. */
-	username = msn_normalize(gaim_account_get_username(account));
+	username = msn_normalize(account, gaim_account_get_username(account));
 
 	if (strcmp(username, gaim_account_get_username(account)))
 		gaim_account_set_username(account, username);
@@ -650,11 +650,11 @@ msn_add_buddy(GaimConnection *gc, const 
 {
 	MsnSession *session = gc->proto_data;
 	MsnGroup *msn_group = NULL;
-	char *who;
+	const char *who;
 	char outparams[MSN_BUF_LEN];
 	GSList *l;
 
-	who = msn_normalize(name);
+	who = msn_normalize(gc->account, name);
 
 	if (strchr(who, ' ')) {
 		/* This is a broken blist entry. */
@@ -1186,8 +1186,8 @@ msn_convo_closed(GaimConnection *gc, con
 	}
 }
 
-static char *
-msn_normalize(const char *str)
+static const char *
+msn_normalize(const GaimAccount *account, const char *str)
 {
 	static char buf[BUF_LEN];