[Gaim-commits] CVS: gaim/src/protocols/msn msn.c,1.239,1.240

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

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

Modified Files:
	msn.c 
Log Message:
all sorts of stuff including tweaks to logging so it mostly works again
for jabber.  


Index: msn.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/msn.c,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -d -p -r1.239 -r1.240
--- msn.c	17 Oct 2003 14:57:59 -0000	1.239
+++ msn.c	24 Oct 2003 05:46:01 -0000	1.240
@@ -36,7 +36,7 @@
 
 static GaimPlugin *my_protocol = NULL;
 
-static const char *msn_normalize(const char *str);
+static const char *msn_normalize(const GaimAccount *account, const char *str);
 
 typedef struct
 {
@@ -481,7 +481,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);
@@ -674,7 +674,7 @@ msn_add_buddy(GaimConnection *gc, const 
 	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. */
@@ -1207,7 +1207,7 @@ msn_convo_closed(GaimConnection *gc, con
 }
 
 static const char *
-msn_normalize(const char *str)
+msn_normalize(const GaimAccount *account, const char *str)
 {
 	static char buf[BUF_LEN];