# HG changeset patch
# User Luke Schierer <lschiere@pidgin.im>
# Date 1096422816 0
# Node ID 7cbe12859d3a8e313f1ad80fa21e580209d15a2a
# Parent  f948913f3c3345d36d73223f5e1befa30fe5013c
[gaim-migrate @ 11045]
" msn_act_id() checks the length of the string it is
passed to ensure that it is less than
BUDDY_ALIAS_MAXLEN before attempting to send the
command to the server. However, it checks the string
before encoding it so if you pass a string that becomes
longer than BUDDY_ALIAS_MAXLEN after encoding it then
MSN will drop the connection when attempting to update
your friendly name.

Patch is for cvs head. I also have a patch for 1.0.0,
if interested." --dbattams

patch okayed by shx

committer: Tailor Script <tailor@pidgin.im>

diff -r f948913f3c33 -r 7cbe12859d3a COPYRIGHT
--- a/COPYRIGHT	Tue Sep 28 00:22:47 2004 +0000
+++ b/COPYRIGHT	Wed Sep 29 01:53:36 2004 +0000
@@ -8,6 +8,7 @@
 Paul Aurich
 Patrick Aussems
 Kevin Barry
+Derek Battams
 Curtis Beattie
 Dave Bell
 Brian Bernas
diff -r f948913f3c33 -r 7cbe12859d3a src/protocols/msn/msn.c
--- a/src/protocols/msn/msn.c	Tue Sep 28 00:22:47 2004 +0000
+++ b/src/protocols/msn/msn.c	Wed Sep 29 01:53:36 2004 +0000
@@ -107,7 +107,10 @@
 	cmdproc = session->notification->cmdproc;
 	account = gaim_connection_get_account(gc);
 
-	alias = (entry && *entry) ? entry : "";
+	if(entry && strlen(entry))
+		alias = gaim_url_encode(entry);
+	else
+		alias = "";
 
 	if (strlen(alias) > BUDDY_ALIAS_MAXLEN)
 	{
@@ -118,7 +121,7 @@
 
 	msn_cmdproc_send(cmdproc, "REA", "%s %s",
 					 gaim_account_get_username(account),
-					 gaim_url_encode(alias));
+					 alias);
 }
 
 static void