Mercurial > pidgin

comparison libpurple/protocols/msn/contact.c @ 23733:679a61dcf5c2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix compatibility with glib < 2.4 for g_markup_printf_escaped. untested.
author Stu Tomlinson <stu@nosnilmot.com>
date Fri, 15 Aug 2008 02:42:52 +0000
parents 860e5e210fc9
children d572fb194e61
comparison
equal deleted inserted replaced
23732:142c1ff499fd 23733:679a61dcf5c2
219 g_return_if_fail(session->user != NULL); 219 g_return_if_fail(session->user != NULL);
220 g_return_if_fail(session->user->passport != NULL); 220 g_return_if_fail(session->user->passport != NULL);
221 221
222 purple_debug_info("msn", "Creating an Address Book.\n"); 222 purple_debug_info("msn", "Creating an Address Book.\n");
223 223
224 body = g_markup_printf_escaped(MSN_ADD_ADDRESSBOOK_TEMPLATE, 224 body = purple_markup_printf_escaped(MSN_ADD_ADDRESSBOOK_TEMPLATE,
225 msn_nexus_get_token_str(session->nexus, MSN_AUTH_CONTACTS), 225 msn_nexus_get_token_str(session->nexus, MSN_AUTH_CONTACTS),
226 session->user->passport); 226 session->user->passport);
227 227
228 msn_soap_message_send(session, 228 msn_soap_message_send(session,
229 msn_soap_message_new(MSN_ADD_ADDRESSBOOK_SOAP_ACTION, 229 msn_soap_message_new(MSN_ADD_ADDRESSBOOK_SOAP_ACTION,
406 if (update_time != NULL) { 406 if (update_time != NULL) {
407 purple_debug_info("msn", "CL Last update time: %s\n", update_time); 407 purple_debug_info("msn", "CL Last update time: %s\n", update_time);
408 update_str = g_strdup_printf(MSN_GET_CONTACT_UPDATE_XML,update_time); 408 update_str = g_strdup_printf(MSN_GET_CONTACT_UPDATE_XML,update_time);
409 } 409 }
410 410
411 body = g_markup_printf_escaped(MSN_GET_CONTACT_TEMPLATE, partner_scenario_str, 411 body = purple_markup_printf_escaped(MSN_GET_CONTACT_TEMPLATE, partner_scenario_str,
412 msn_nexus_get_token_str(session->nexus, MSN_AUTH_CONTACTS), 412 msn_nexus_get_token_str(session->nexus, MSN_AUTH_CONTACTS),
413 update_str ? update_str : ""); 413 update_str ? update_str : "");
414 414
415 msn_soap_message_send(session, 415 msn_soap_message_send(session,
416 msn_soap_message_new(MSN_GET_CONTACT_SOAP_ACTION, 416 msn_soap_message_new(MSN_GET_CONTACT_SOAP_ACTION,
805 if (dynamicItemLastChange != NULL) 805 if (dynamicItemLastChange != NULL)
806 update_str = g_strdup_printf(MSN_GET_ADDRESS_UPDATE_XML, dynamicItemLastChange); 806 update_str = g_strdup_printf(MSN_GET_ADDRESS_UPDATE_XML, dynamicItemLastChange);
807 else if (LastChanged != NULL) 807 else if (LastChanged != NULL)
808 update_str = g_strdup_printf(MSN_GET_ADDRESS_UPDATE_XML, LastChanged); 808 update_str = g_strdup_printf(MSN_GET_ADDRESS_UPDATE_XML, LastChanged);
809 809
810 body = g_markup_printf_escaped(MSN_GET_ADDRESS_TEMPLATE, 810 body = purple_markup_printf_escaped(MSN_GET_ADDRESS_TEMPLATE,
811 MsnSoapPartnerScenarioText[partner_scenario], 811 MsnSoapPartnerScenarioText[partner_scenario],
812 msn_nexus_get_token_str(session->nexus, MSN_AUTH_CONTACTS), 812 msn_nexus_get_token_str(session->nexus, MSN_AUTH_CONTACTS),
813 update_str ? update_str : ""); 813 update_str ? update_str : "");
814 814
815 msn_soap_message_send(session, 815 msn_soap_message_send(session,