Mercurial > pidgin.yaz

changeset 20404:455c5700c866

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Really the last of the merge changes.
author Richard Laager <rlaager@wiktel.com>
date Sun, 15 Apr 2007 05:39:09 +0000
parents 599b5a4aebab
children 2f123c4b36a2
files libpurple/protocols/msn/soap.c libpurple/protocols/msn/userlist.c
diffstat 2 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/msn/soap.c	Sun Apr 15 05:28:07 2007 +0000
+++ b/libpurple/protocols/msn/soap.c	Sun Apr 15 05:39:09 2007 +0000
@@ -327,6 +327,10 @@
 
 		msn_session_set_error(session, MSN_ERROR_SERV_UNAVAILABLE, error);
 	}
+	else if (strstr(soapconn->read_buf, "HTTP/1.1 503 Service Unavailable"))
+	{
+		msn_session_set_error(session, MSN_ERROR_SERV_UNAVAILABLE, NULL);
+	}
 	else if ((strstr(soapconn->read_buf, "HTTP/1.1 200 OK"))
 		||(strstr(soapconn->read_buf, "HTTP/1.1 500")))
 	{
--- a/libpurple/protocols/msn/userlist.c	Sun Apr 15 05:28:07 2007 +0000
+++ b/libpurple/protocols/msn/userlist.c	Sun Apr 15 05:39:09 2007 +0000
@@ -392,9 +392,7 @@
 		 */
 
 		if (!(list_op & (MSN_LIST_AL_OP | MSN_LIST_BL_OP)))
-		{
-			got_new_entry(gc, passport, store);
-		}
+//			got_new_entry(gc, passport, store);
 	}
 
 	user->list_op |= list_op;