diff options
| author | Elliott Sales de Andrade <qulogic@pidgin.im> | 2007-12-26 00:35:26 +0000 |
|---|---|---|
| committer | Elliott Sales de Andrade <qulogic@pidgin.im> | 2007-12-26 00:35:26 +0000 |
| commit | bf04e2850318e65d4bbc2d3efc2b349ac778b01c (patch) | |
| tree | c68ae68521104902ca213e75e85629963fc7fb42 | |
| parent | 7eed246d5e4dde493cffc17960e0053d667e102b (diff) | |
| download | pidgin-bf04e2850318e65d4bbc2d3efc2b349ac778b01c.tar.gz | |
Patch 4 from Qulogic, this one fixes a group name escape bug introduced by
patch 3
committer: Ka-Hing Cheung <khc@pidgin.im>
| -rw-r--r-- | libpurple/protocols/msn/contact.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/libpurple/protocols/msn/contact.c b/libpurple/protocols/msn/contact.c index cc04e779a2..1b199f703b 100644 --- a/libpurple/protocols/msn/contact.c +++ b/libpurple/protocols/msn/contact.c @@ -1370,6 +1370,7 @@ void msn_add_group(MsnSession *session, MsnCallbackState *state, const char* group_name) { char *body = NULL; + char *escaped_group_name = NULL; g_return_if_fail(session != NULL); g_return_if_fail(group_name != NULL); @@ -1386,9 +1387,11 @@ msn_add_group(MsnSession *session, MsnCallbackState *state, const char* group_na /* escape group name's html special chars so it can safely be sent * in a XML SOAP request */ - body = g_markup_printf_escaped(MSN_GROUP_ADD_TEMPLATE, - msn_contact_get_token(session->contact), - group_name); + escaped_group_name = g_markup_escape_text(group_name, -1); + body = g_strdup_printf(MSN_GROUP_ADD_TEMPLATE, + msn_contact_get_token(session->contact), + escaped_group_name); + g_free(escaped_group_name); msn_soap_message_send(session, msn_soap_message_new(MSN_GROUP_ADD_SOAP_ACTION, @@ -1451,6 +1454,7 @@ msn_contact_rename_group(MsnSession *session, const char *old_group_name, const gchar *body = NULL; const gchar * guid; MsnCallbackState *state; + char *escaped_group_name; g_return_if_fail(session != NULL); g_return_if_fail(session->userlist != NULL); @@ -1474,9 +1478,11 @@ msn_contact_rename_group(MsnSession *session, const char *old_group_name, const msn_callback_state_set_action(state, MSN_RENAME_GROUP); - body = g_markup_printf_escaped(MSN_GROUP_RENAME_TEMPLATE, - msn_contact_get_token(session->contact), - guid, new_group_name); + escaped_group_name = g_markup_escape_text(new_group_name, -1); + body = g_strdup_printf(MSN_GROUP_RENAME_TEMPLATE, + msn_contact_get_token(session->contact), + guid, escaped_group_name); + g_free(escaped_group_name); msn_soap_message_send(session, msn_soap_message_new(MSN_GROUP_RENAME_SOAP_ACTION, |