diff src/protocols/msn/userlist.c @ 10225:ecf3ce2e2ab1

[gaim-migrate @ 11357] This is mostly a patch from Felipe Contreras that eliminates MSN switchboard errors and fixes MSN buddy icon syncronization, with some tweaks by me. Thank Felipe if it works, blame me if something broke. I also fixed a couple of text markup escaping things, fixed a glib warning that was bugging me, fix a rare SILC crash, and make gtkstatusselector.c compile (but do nothing) with gtk < 2.4 committer: Tailor Script <[e-mail]>

--- a/src/protocols/msn/userlist.c	Sun Nov 21 06:16:23 2004 +0000
+++ b/src/protocols/msn/userlist.c	Sun Nov 21 17:48:09 2004 +0000
@@ -73,7 +73,7 @@
 got_new_entry(GaimConnection *gc, const char *passport, const char *friendly)
 {
 	MsnPermitAdd *pa;
-	char *msg;
+	char *msg, *escaped;
 
 	pa      = g_new0(MsnPermitAdd, 1);
 	pa->who = g_strdup(passport);
@@ -81,11 +81,13 @@
 
 	if (friendly != NULL)
 	{
+		escaped = g_markup_escape_text(friendly, -1);
 		msg = g_strdup_printf(
 				   _("The user %s (%s) wants to add %s to his or her "
 					 "buddy list."),
-				   passport, friendly,
+				   passport, escaped,
 				   gaim_account_get_username(gc->account));
+		g_free(escaped);
 	}
 	else
 	{
@@ -173,7 +175,7 @@
 	if (old_group_name)
 		data->old_group_name = g_strdup(old_group_name);
 
-	trans = msn_transaction_new("ADG", "%s %d",
+	trans = msn_transaction_new(cmdproc, "ADG", "%s %d",
 								gaim_url_encode(new_group_name),
 								0);