Mercurial > pidgin.yaz

changeset 9900:0172daa9fcb5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 10791] Mebbe this is better? committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Sat, 28 Aug 2004 14:05:41 +0000
parents 8651abf08dd5
children 7bb46db14be0
files src/protocols/msn/notification.c
diffstat 1 files changed, 12 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/src/protocols/msn/notification.c	Sat Aug 28 13:54:55 2004 +0000
+++ b/src/protocols/msn/notification.c	Sat Aug 28 14:05:41 2004 +0000
@@ -355,29 +355,24 @@
 	passport = params[1];
 
 	if (!strcmp(list, "FL"))
-		msg = g_strdup("Unable to add user on MSN");
+		msg = g_strdup_printf("Unable to add user on %s (%s)",
+							  gaim_account_get_username(account),
+							  gaim_account_get_protocol_name(account));
 	else if (!strcmp(list, "BL"))
-		msg = g_strdup("Unable to block user on MSN");
+		msg = g_strdup_printf("Unable to block user on %s (%s)",
+							  gaim_account_get_username(account),
+							  gaim_account_get_protocol_name(account));
 	else if (!strcmp(list, "AL"))
-		msg = g_strdup("Unable to permit user on MSN");
+		msg = g_strdup_printf("Unable to permit user on %s (%s)",
+							  gaim_account_get_username(account),
+							  gaim_account_get_protocol_name(account));
 
 	if (!strcmp(list, "FL"))
 	{
-		if (error == 208)
+		if (error == 210)
 		{
-			reason = g_strdup_printf("%s is not a valid passport account.\n\n"
-									 "This user will be automatically removed "
-									 "from your %s account's buddy list, "
-									 "this won't appear again.",
-									 passport,
-									 gaim_account_get_username(account));
-		}
-		else if (error == 210)
-		{
-			reason = g_strdup_printf("%s's buddy list is full.\n\n"
-									 "%s could not be added.",
-									 gaim_account_get_username(account),
-									 passport);
+			reason = g_strdup_printf("%s could not be added because "
+									 "your buddy list is full.", passport);
 		}
 	}