Changeset 164352e for protocols/msn

Timestamp:

2011-12-24T18:02:39Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

34ded90

Parents:

e306fbf (diff), 96f954d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging mainline.

File:

• protocols/msn/soap.c (modified) (5 diffs)

protocols/msn/soap.c

@@ -60 +60 @@
         struct im_connection *ic;
         int ttl;
+        char *error;
         
         char *url, *action, *payload;
@@ -158 +159 @@
         }
         
+        if( http_req->status_code != 200 )
+                soap_req->error = g_strdup( http_req->status_string );
+        
         st = soap_req->handle_response( soap_req );
 
@@ -164 +168 @@
         g_free( soap_req->action );
         g_free( soap_req->payload );
-        soap_req->url = soap_req->action = soap_req->payload = NULL;
+        g_free( soap_req->error );
+        soap_req->url = soap_req->action = soap_req->payload = soap_req->error = NULL;
         
         if( st == MSN_SOAP_RETRY && --soap_req->ttl )
@@ -253 +258 @@
         g_free( soap_req->action );
         g_free( soap_req->payload );
+        g_free( soap_req->error );
         g_free( soap_req );
 }
@@ -410 +416 @@
         if( sd->secret == NULL )
         {
-                msn_auth_got_passport_token( ic, NULL, sd->error );
+                msn_auth_got_passport_token( ic, NULL, sd->error ? sd->error : soap_req->error );
                 return MSN_SOAP_OK;
         }