pidgin/pidgin

Use accessor for SoupMessage->reason_phrase

2021-12-14, Elliott Sales de Andrade
0b5c475770e2
Parents 9f0f4c23132e
Children b0b7d118475f
Use accessor for SoupMessage->reason_phrase
7 files changed, 13 insertions(+), 7 deletions(-)
  • +1 -1
    libpurple/protocols/facebook/api.c
  • +1 -1
    libpurple/protocols/facebook/http.c
  • +3 -2
    libpurple/protocols/gg/avatar.c
  • +1 -1
    libpurple/protocols/jabber/bosh.c
  • +1 -1
    libpurple/protocols/jabber/useravatar.c
  • +5 -0
    libpurple/soupcompat.h
  • +1 -1
    libpurple/upnp.c
    • --- a/libpurple/protocols/facebook/api.c Tue Dec 14 01:57:00 2021 -0600
    +++ b/libpurple/protocols/facebook/api.c Tue Dec 14 01:57:00 2021 -0600
    @@ -644,7 +644,7 @@
    gint code;
    gsize size;
    - msg = res->reason_phrase;
    + msg = soup_message_get_reason_phrase(res);
    code = soup_message_get_status(res);
    data = res->response_body->data;
    size = res->response_body->length;
    --- a/libpurple/protocols/facebook/http.c Tue Dec 14 01:57:00 2021 -0600
    +++ b/libpurple/protocols/facebook/http.c Tue Dec 14 01:57:00 2021 -0600
    @@ -49,7 +49,7 @@
    }
    g_set_error(error, FB_HTTP_ERROR, status_code, "%s",
    - res->reason_phrase);
    + soup_message_get_reason_phrase(res));
    return FALSE;
    }
    --- a/libpurple/protocols/gg/avatar.c Tue Dec 14 01:57:00 2021 -0600
    +++ b/libpurple/protocols/gg/avatar.c Tue Dec 14 01:57:00 2021 -0600
    @@ -117,7 +117,8 @@
    purple_debug_error("gg",
    "ggp_avatar_buddy_update_received: bad response "
    "while getting avatar for %u: %s",
    - pending_update->uin, msg->reason_phrase);
    + pending_update->uin,
    + soup_message_get_reason_phrase(msg));
    g_free(pending_update);
    return;
    }
    @@ -244,7 +245,7 @@
    if (!SOUP_STATUS_IS_SUCCESSFUL(soup_message_get_status(msg))) {
    purple_debug_error("gg", "ggp_avatar_own_sent: avatar not sent. %s\n",
    - msg->reason_phrase);
    + soup_message_get_reason_phrase(msg));
    return;
    }
    purple_debug_info("gg", "ggp_avatar_own_sent: %s\n",
    --- a/libpurple/protocols/jabber/bosh.c Tue Dec 14 01:57:00 2021 -0600
    +++ b/libpurple/protocols/jabber/bosh.c Tue Dec 14 01:57:00 2021 -0600
    @@ -202,7 +202,7 @@
    if (!SOUP_STATUS_IS_SUCCESSFUL(soup_message_get_status(response))) {
    gchar *tmp = g_strdup_printf(_("Unable to connect: %s"),
    - response->reason_phrase);
    + soup_message_get_reason_phrase(response));
    purple_connection_error(conn->js->gc,
    PURPLE_CONNECTION_ERROR_NETWORK_ERROR, tmp);
    g_free(tmp);
    --- a/libpurple/protocols/jabber/useravatar.c Tue Dec 14 01:57:00 2021 -0600
    +++ b/libpurple/protocols/jabber/useravatar.c Tue Dec 14 01:57:00 2021 -0600
    @@ -221,7 +221,7 @@
    if (!SOUP_STATUS_IS_SUCCESSFUL(soup_message_get_status(msg))) {
    purple_debug_error("jabber",
    "do_buddy_avatar_update_fromurl got error \"%s\"",
    - msg->reason_phrase);
    + soup_message_get_reason_phrase(msg));
    goto out;
    }
    --- a/libpurple/soupcompat.h Tue Dec 14 01:57:00 2021 -0600
    +++ b/libpurple/soupcompat.h Tue Dec 14 01:57:00 2021 -0600
    @@ -31,6 +31,11 @@
    #if SOUP_MAJOR_VERSION < 3
    +static inline const char *
    +soup_message_get_reason_phrase(SoupMessage *msg) {
    + return msg->reason_phrase;
    +}
    +
    static inline SoupStatus
    soup_message_get_status(SoupMessage *msg) {
    return msg->status_code;
    --- a/libpurple/upnp.c Tue Dec 14 01:57:00 2021 -0600
    +++ b/libpurple/upnp.c Tue Dec 14 01:57:00 2021 -0600
    @@ -861,7 +861,7 @@
    if (!SOUP_STATUS_IS_SUCCESSFUL(soup_message_get_status(msg))) {
    purple_debug_error("upnp",
    "purple_upnp_set_port_mapping(): Failed HTTP_OK: %s",
    - msg->reason_phrase);
    + soup_message_get_reason_phrase(msg));
    success = FALSE;
    } else {
    purple_debug_info("upnp",