pidgin: f12c8903: shuffle some code around to make sure ar...

[khc at pidgin.im]

-----------------------------------------------------------------
Revision: f12c8903079425d7850fa183df0b3f937b2952be
Ancestor: 8dc700994ec5d152ef4553445e3ae21db5138543
Author: khc at pidgin.im
Date: 2008-09-11T04:19:37
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/f12c8903079425d7850fa183df0b3f937b2952be

Modified files:
        libpurple/protocols/msn/soap.c

ChangeLog: 

shuffle some code around to make sure are using the right errno, 
References #7032


-------------- next part --------------
============================================================
--- libpurple/protocols/msn/soap.c	3ef84ca988e9d979d34a76b687b1ba1a92755f95
+++ libpurple/protocols/msn/soap.c	a76c96f6673d6797f67a0394f104fa21d4e166e9
@@ -284,6 +284,11 @@ msn_soap_read_cb(gpointer data, gint fd,
 		count += cnt;
 		g_string_append_len(conn->buf, buf, cnt);
 	}
+
+	perrno = errno;
+	if (cnt < 0 && perrno != EAGAIN)
+		purple_debug_info("soap", "read: %s\n", g_strerror(perrno));
+
 #ifndef MSN_UNSAFE_DEBUG
 	if (conn->current_request->secure)
 		purple_debug_misc("soap", "Received secure request.\n");
@@ -299,11 +304,9 @@ msn_soap_read_cb(gpointer data, gint fd,
 		return;
 
 	/* msn_soap_process could alter errno */
-	perrno = errno;
 	msn_soap_process(conn);
 	
 	if (cnt < 0 && perrno != EAGAIN) {
-		purple_debug_info("soap", "read: %s\n", g_strerror(perrno));
 		/* It's possible msn_soap_process closed the ssl connection */
 		if (conn->ssl) {
 			purple_ssl_close(conn->ssl);