Changeset 4e1be76

Timestamp:

2010-09-04T17:23:46Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

975708a

Parents:

27053b5

Message:

Clean up any stuff stuck in the soap queue at disconnect time.

Location:

protocols/msn

Files:

• msn.c (modified) (1 diff)
• soap.c (modified) (5 diffs)
• soap.h (modified) (1 diff)

protocols/msn/msn.c

@@ -92 +92 @@
                 
                 msn_msgq_purge( ic, &md->msgq );
+                msn_soapq_flush( ic, FALSE );
                 
                 for( i = 0; i < sizeof( md->tokens ) / sizeof( md->tokens[0] ); i ++ )

protocols/msn/soap.c

@@ -69 +69 @@
 
 static int msn_soap_send_request( struct msn_soap_req_data *req );
+static void msn_soap_free( struct msn_soap_req_data *soap_req );
 static void msn_soap_debug_print( const char *headers, const char *payload );
 
@@ -127 +128 @@
         if( g_slist_find( msn_connections, soap_req->ic ) == NULL )
         {
-                soap_req->free_data( soap_req );
-                g_free( soap_req->url );
-                g_free( soap_req->action );
-                g_free( soap_req->payload );
-                g_free( soap_req );
+                msn_soap_free( soap_req );
                 return;
         }
@@ -232 +229 @@
 }
 
-static int msn_soapq_empty( struct im_connection *ic )
+int msn_soapq_flush( struct im_connection *ic, gboolean resend )
 {
         struct msn_data *md = ic->proto_data;
@@ -238 +235 @@
         while( md->soapq )
         {
-                msn_soap_send_request( (struct msn_soap_req_data*) md->soapq->data );
+                if( resend )
+                        msn_soap_send_request( (struct msn_soap_req_data*) md->soapq->data );
+                else
+                        msn_soap_free( (struct msn_soap_req_data*) md->soapq->data );
                 md->soapq = g_slist_remove( md->soapq, md->soapq->data );
         }
         
         return MSN_SOAP_OK;
+}
+
+static void msn_soap_free( struct msn_soap_req_data *soap_req )
+{
+        soap_req->free_data( soap_req );
+        g_free( soap_req->url );
+        g_free( soap_req->action );
+        g_free( soap_req->payload );
+        g_free( soap_req );
 }
 
@@ -370 +379 @@
         
         if( md->soapq )
-                return msn_soapq_empty( ic );
+                return msn_soapq_flush( ic, TRUE );
         
         if( sd->secret == NULL )

protocols/msn/soap.h

@@ -43 +43 @@
 #endif
 #include "nogaim.h"
+
+
+int msn_soapq_flush( struct im_connection *ic, gboolean resend );