Changeset 6ddb223 for protocols/msn/soap.c

Timestamp:

2010-08-14T19:57:13Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

4fc95c5

Parents:

193dc74

Message:

Separate boilerplate and body of abservice SOAP requests since the former's
the same all the time (and I have to add some more request types).

File:

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

protocols/msn/soap.c

@@ -145 +145 @@
                 g_free( soap_req );
         }
+}
+
+static char *msn_soap_abservice_build( const char *body_fmt, const char *scenario, const char *ticket, ... )
+{
+        va_list params;
+        char *ret, *format, *body;
+        
+        format = g_markup_printf_escaped( SOAP_ABSERVICE_PAYLOAD, scenario, ticket );
+        
+        va_start( params, ticket );
+        body = g_strdup_vprintf( body_fmt, params );
+        va_end( params );
+        
+        ret = g_strdup_printf( format, body );
+        g_free( body );
+        g_free( format );
+        
+        return ret;
 }
 
@@ -445 +463 @@
         soap_req->url = g_strdup( SOAP_MEMLIST_URL );
         soap_req->action = g_strdup( SOAP_MEMLIST_ACTION );
-        soap_req->payload = g_markup_printf_escaped( SOAP_MEMLIST_PAYLOAD, md->tokens[1] );
+        soap_req->payload = msn_soap_abservice_build( SOAP_MEMLIST_PAYLOAD, "Initial", md->tokens[1] );
         
         return 1;
@@ -562 +580 @@
                 break;
         }
-        soap_req->payload = g_markup_printf_escaped( SOAP_MEMLIST_EDIT_PAYLOAD,
+        soap_req->payload = msn_soap_abservice_build( SOAP_MEMLIST_EDIT_PAYLOAD,
                 scenario, md->tokens[1], add, list, med->handle, add );
         
@@ -607 +625 @@
         soap_req->url = g_strdup( SOAP_ADDRESSBOOK_URL );
         soap_req->action = g_strdup( SOAP_ADDRESSBOOK_ACTION );
-        soap_req->payload = g_markup_printf_escaped( SOAP_ADDRESSBOOK_PAYLOAD, md->tokens[1] );
+        soap_req->payload = msn_soap_abservice_build( SOAP_ADDRESSBOOK_PAYLOAD, "Initial", md->tokens[1] );
         
         return 1;
@@ -706 +724 @@
         soap_req->url = g_strdup( SOAP_ADDRESSBOOK_URL );
         soap_req->action = g_strdup( SOAP_AB_NAMECHANGE_ACTION );
-        soap_req->payload = g_markup_printf_escaped( SOAP_AB_NAMECHANGE_PAYLOAD,
-                md->tokens[1], (char *) soap_req->data );
+        soap_req->payload = msn_soap_abservice_build( SOAP_AB_NAMECHANGE_PAYLOAD,
+                "Initial", md->tokens[1], (char *) soap_req->data );
         
         return 1;