changeset 10269:59b1fce24f60

[gaim-migrate @ 11417] There was a glitch in the matrix. Don't crash if the users MSN buddy list is temporarily unavailable (fixes the crash reported in patch 1072279) committer: Tailor Script <tailor@pidgin.im>
author Stu Tomlinson <stu@nosnilmot.com>
date Fri, 26 Nov 2004 18:13:56 +0000
parents d082b2a71ee7
children e5451763f5b9
files src/protocols/msn/notification.c
diffstat 1 files changed, 22 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/protocols/msn/notification.c	Fri Nov 26 05:21:58 2004 +0000
+++ b/src/protocols/msn/notification.c	Fri Nov 26 18:13:56 2004 +0000
@@ -711,6 +711,28 @@
 	int total_users;
 
 	session = cmdproc->session;
+
+	if (cmd->param_count == 2)
+	{
+		char *buf;
+		/*
+		 * This can happen if we sent a SYN with an up-to-date
+		 * buddy list revision, but we send 0 to get a full list.
+		 * So, error out.
+		 */
+		buf = g_strdup_printf(
+				_("Your MSN buddy list for %s is temporarily unavailable. "
+				  "Please wait and try again."),
+				gaim_account_get_username(session->account));
+
+		gaim_connection_error(gaim_account_get_connection(session->account),
+							  buf);
+
+		g_free(buf);
+
+		return;
+	}
+
 	total_users  = atoi(cmd->params[2]);
 
 	if (total_users == 0)