pidgin/pidgin

Remove libsoup2 code

13 months ago, Elliott Sales de Andrade
8f7b46f497c6
Parents 4185b4043214
Children d5722fdbdf86
Remove libsoup2 code

Soup 3 has been required since /r/2068.

Testing Done:
Compiled only.

Reviewed at https://reviews.imfreedom.org/r/2375/
4 files changed, 1 insertions(+), 243 deletions(-)
  • +1 -28
    libpurple/protocols/facebook/http.c
  • +0 -156
    libpurple/protocols/gg/edisc.c
  • +0 -4
    libpurple/protocols/jabber/bosh.c
  • +0 -55
    libpurple/protocols/jabber/oob.c
    • --- a/libpurple/protocols/facebook/http.c Tue Mar 21 01:59:19 2023 -0500
    +++ b/libpurple/protocols/facebook/http.c Tue Mar 21 02:07:16 2023 -0500
    @@ -233,11 +233,7 @@
    fb_http_urlcmp(const gchar *url1, const gchar *url2, gboolean protocol)
    {
    gboolean ret = TRUE;
    -#if SOUP_MAJOR_VERSION >= 3
    GUri *uri1, *uri2;
    -#else
    - SoupURI *uri1, *uri2;
    -#endif
    if ((url1 == NULL) || (url2 == NULL)) {
    return url1 == url2;
    @@ -247,7 +243,6 @@
    return TRUE;
    }
    -#if SOUP_MAJOR_VERSION >= 3
    uri1 = g_uri_parse(url1, SOUP_HTTP_URI_FLAGS, NULL);
    if (uri1 == NULL) {
    return g_ascii_strcasecmp(url1, url2) == 0;
    @@ -277,33 +272,11 @@
    g_uri_unref(uri2);
    uri2 = tmp;
    }
    -#else
    - uri1 = soup_uri_new(url1);
    - if (uri1 == NULL) {
    - return g_ascii_strcasecmp(url1, url2) == 0;
    - }
    -
    - uri2 = soup_uri_new(url2);
    - if (uri2 == NULL) {
    - soup_uri_free(uri1);
    - return g_ascii_strcasecmp(url1, url2) == 0;
    - }
    -
    - if (!protocol) {
    - /* Force the same scheme (and same port). */
    - soup_uri_set_scheme(uri1, SOUP_URI_SCHEME_HTTPS);
    - soup_uri_set_scheme(uri2, SOUP_URI_SCHEME_HTTPS);
    - }
    -#endif
    ret = soup_uri_equal(uri1, uri2);
    -#if SOUP_MAJOR_VERSION >= 3
    g_uri_unref(uri1);
    g_uri_unref(uri2);
    -#else
    - soup_uri_free(uri1);
    - soup_uri_free(uri2);
    -#endif
    +
    return ret;
    }
    --- a/libpurple/protocols/gg/edisc.c Tue Mar 21 01:59:19 2023 -0500
    +++ b/libpurple/protocols/gg/edisc.c Tue Mar 21 02:07:16 2023 -0500
    @@ -620,8 +620,6 @@
    xfer);
    }
    -#if SOUP_MAJOR_VERSION >= 3
    -
    static void
    ggp_edisc_xfer_send_done(GObject *source, GAsyncResult *async_result,
    gpointer data)
    @@ -682,75 +680,6 @@
    purple_xfer_get_size(xfer));
    }
    -#else /* SOUP_MAJOR_VERSION >= 3 */
    -
    -static void
    -ggp_edisc_xfer_send_reader(SoupMessage *msg, gpointer _xfer)
    -{
    - PurpleXfer *xfer = _xfer;
    - guchar *buffer;
    - /* FIXME: The read/write xfer implementation sizes this dynamically. */
    - gsize length = 4096;
    - gssize stored;
    -
    - buffer = g_new(guchar, length);
    - stored = purple_xfer_read_file(xfer, buffer, length);
    -
    - if (stored < 0) {
    - GGPXfer *edisc_xfer = GGP_XFER(xfer);
    - ggp_edisc_session_data *sdata = ggp_edisc_get_sdata(edisc_xfer->gc);
    - soup_session_cancel_message(sdata->session, msg, SOUP_STATUS_IO_ERROR);
    - return;
    - }
    -
    - soup_message_body_append(msg->request_body, SOUP_MEMORY_TAKE, buffer,
    - stored);
    - if (purple_xfer_get_bytes_sent(xfer) >= purple_xfer_get_size(xfer)) {
    - soup_message_body_complete(msg->request_body);
    - }
    -}
    -
    -static void
    -ggp_edisc_xfer_send_done(G_GNUC_UNUSED SoupSession *session, SoupMessage *msg,
    - gpointer _xfer)
    -{
    - PurpleXfer *xfer = _xfer;
    - GGPXfer *edisc_xfer = GGP_XFER(xfer);
    - JsonParser *parser;
    - JsonObject *result;
    - int result_status = -1;
    -
    - if (purple_xfer_is_cancelled(xfer)) {
    - return;
    - }
    -
    - g_return_if_fail(edisc_xfer != NULL);
    -
    - edisc_xfer->msg = NULL;
    -
    - if (!SOUP_STATUS_IS_SUCCESSFUL(soup_message_get_status(msg))) {
    - ggp_edisc_xfer_error(xfer, _("Error while sending a file"));
    - return;
    - }
    -
    - parser = ggp_json_parse(msg->response_body->data);
    - result = json_node_get_object(json_parser_get_root(parser));
    - result = json_object_get_object_member(result, "result");
    - if (json_object_has_member(result, "status")) {
    - result_status = json_object_get_int_member(result, "status");
    - }
    - g_object_unref(parser);
    -
    - if (result_status == 0) {
    - purple_xfer_set_completed(xfer, TRUE);
    - purple_xfer_end(xfer);
    - } else {
    - ggp_edisc_xfer_error(xfer, _("Error while sending a file"));
    - }
    -}
    -
    -#endif /* SOUP_MAJOR_VERSION >= 3 */
    -
    static void ggp_edisc_xfer_send_start(PurpleXfer *xfer)
    {
    ggp_edisc_session_data *sdata;
    @@ -785,7 +714,6 @@
    purple_xfer_get_size(xfer));
    edisc_xfer->msg = msg;
    -#if SOUP_MAJOR_VERSION >= 3
    g_signal_connect(msg, "starting",
    G_CALLBACK(ggp_edisc_xfer_send_start_msg_cb), xfer);
    g_signal_connect(msg, "restarted",
    @@ -793,16 +721,6 @@
    soup_session_send_and_read_async(sdata->session, msg, G_PRIORITY_DEFAULT,
    edisc_xfer->cancellable,
    ggp_edisc_xfer_send_done, xfer);
    -#else
    - soup_message_set_flags(msg, SOUP_MESSAGE_CAN_REBUILD);
    - soup_message_body_set_accumulate(msg->request_body, FALSE);
    - g_signal_connect(msg, "wrote-headers",
    - G_CALLBACK(ggp_edisc_xfer_send_reader), xfer);
    - g_signal_connect(msg, "wrote-chunk", G_CALLBACK(ggp_edisc_xfer_send_reader),
    - xfer);
    - soup_session_queue_message(sdata->session, msg, ggp_edisc_xfer_send_done,
    - xfer);
    -#endif
    }
    PurpleXfer *
    @@ -967,8 +885,6 @@
    purple_xfer_start(xfer, -1, NULL, 0);
    }
    -#if SOUP_MAJOR_VERSION >= 3
    -
    static gboolean
    ggp_edisc_xfer_recv_pollable_source_cb(GObject *pollable_stream, gpointer data)
    {
    @@ -1072,65 +988,6 @@
    g_clear_object(&edisc_xfer->msg);
    }
    -#else /* SOUP_MAJOR_VERSION >= 3 */
    -
    -static void
    -ggp_edisc_xfer_recv_writer(SoupMessage *msg, SoupBuffer *chunk, gpointer _xfer)
    -{
    - PurpleXfer *xfer = _xfer;
    - GGPXfer *edisc_xfer = GGP_XFER(xfer);
    - ggp_edisc_session_data *sdata = ggp_edisc_get_sdata(edisc_xfer->gc);
    - gboolean stored;
    -
    - if (chunk->length > purple_xfer_get_bytes_remaining(xfer)) {
    - purple_debug_error(
    - "gg",
    - "ggp_edisc_xfer_recv_writer: saved too much (%" G_GSIZE_FORMAT
    - " > %" G_GOFFSET_FORMAT ")",
    - chunk->length, purple_xfer_get_bytes_remaining(xfer));
    - soup_session_cancel_message(sdata->session, msg, SOUP_STATUS_IO_ERROR);
    - return;
    - }
    -
    - stored = purple_xfer_write_file(xfer, (const guchar *)chunk->data,
    - chunk->length);
    -
    - if (!stored) {
    - purple_debug_error("gg", "ggp_edisc_xfer_recv_writer: saved too less");
    - soup_session_cancel_message(sdata->session, msg, SOUP_STATUS_IO_ERROR);
    - return;
    - }
    -}
    -
    -static void
    -ggp_edisc_xfer_recv_done(G_GNUC_UNUSED SoupSession *session, SoupMessage *msg,
    - gpointer _xfer)
    -{
    - PurpleXfer *xfer = _xfer;
    - GGPXfer *edisc_xfer = GGP_XFER(xfer);
    -
    - if (purple_xfer_is_cancelled(xfer))
    - return;
    -
    - edisc_xfer->msg = NULL;
    -
    - if (!SOUP_STATUS_IS_SUCCESSFUL(soup_message_get_status(msg))) {
    - ggp_edisc_xfer_error(xfer, _("Error while receiving a file"));
    - return;
    - }
    -
    - if (purple_xfer_get_bytes_remaining(xfer) == 0) {
    - purple_xfer_set_completed(xfer, TRUE);
    - purple_xfer_end(xfer);
    - } else {
    - purple_debug_warning("gg", "ggp_edisc_xfer_recv_done: didn't "
    - "received everything\n");
    - ggp_edisc_xfer_error(xfer, _("Error while receiving a file"));
    - }
    -}
    -
    -#endif /* SOUP_MAJOR_VERSION >= 3 */
    -
    static void
    ggp_edisc_xfer_recv_start(PurpleXfer *xfer)
    {
    @@ -1158,18 +1015,9 @@
    // purple_http_request_set_max_len(msg, purple_xfer_get_size(xfer) + 1);
    edisc_xfer->msg = msg;
    -#if SOUP_MAJOR_VERSION >= 3
    soup_session_send_async(sdata->session, msg, G_PRIORITY_DEFAULT,
    edisc_xfer->cancellable,
    ggp_edisc_xfer_recv_done_cb, xfer);
    -#else
    - soup_message_body_set_accumulate(msg->response_body, FALSE);
    - g_signal_connect(msg, "got-chunk", G_CALLBACK(ggp_edisc_xfer_recv_writer),
    - xfer);
    -
    - soup_session_queue_message(sdata->session, msg, ggp_edisc_xfer_recv_done,
    - xfer);
    -#endif
    }
    static void
    @@ -1461,10 +1309,6 @@
    g_free(edisc_xfer->filename);
    g_cancellable_cancel(edisc_xfer->cancellable);
    g_clear_object(&edisc_xfer->cancellable);
    -#if SOUP_MAJOR_VERSION < 3
    - soup_session_cancel_message(sdata->session, edisc_xfer->msg,
    - SOUP_STATUS_CANCELLED);
    -#endif
    g_clear_object(&edisc_xfer->msg);
    g_clear_handle_id(&edisc_xfer->handler, g_source_remove);
    --- a/libpurple/protocols/jabber/bosh.c Tue Mar 21 01:59:19 2023 -0500
    +++ b/libpurple/protocols/jabber/bosh.c Tue Mar 21 02:07:16 2023 -0500
    @@ -329,12 +329,8 @@
    g_string_free(data, FALSE);
    if (conn->is_terminating) {
    -#if SOUP_MAJOR_VERSION >= 3
    soup_session_send_async(conn->payload_reqs, req, G_PRIORITY_DEFAULT,
    NULL, NULL, NULL);
    -#else
    - soup_session_send_async(conn->payload_reqs, req, NULL, NULL, NULL);
    -#endif
    g_free(conn->sid);
    conn->sid = NULL;
    } else {
    --- a/libpurple/protocols/jabber/oob.c Tue Mar 21 01:59:19 2023 -0500
    +++ b/libpurple/protocols/jabber/oob.c Tue Mar 21 02:07:16 2023 -0500
    @@ -69,7 +69,6 @@
    purple_xfer_set_size(xfer, total);
    }
    -#if SOUP_MAJOR_VERSION >= 3
    static void
    jabber_oob_xfer_writer(GObject *source, GAsyncResult *result, gpointer data) {
    GInputStream *input = G_INPUT_STREAM(source);
    @@ -148,45 +147,6 @@
    jabber_oob_xfer_writer, xfer);
    }
    -#else /* SOUP_MAJOR_VERSION < 3 */
    -
    -static void
    -jabber_oob_xfer_got(G_GNUC_UNUSED SoupSession *session, SoupMessage *msg,
    - gpointer user_data)
    -{
    - PurpleXfer *xfer = user_data;
    - JabberOOBXfer *jox;
    -
    - if (purple_xfer_is_cancelled(xfer))
    - return;
    -
    - jox = JABBER_OOB_XFER(xfer);
    - jox->msg = NULL;
    -
    - if (!SOUP_STATUS_IS_SUCCESSFUL(soup_message_get_status(msg)) ||
    - purple_xfer_get_bytes_remaining(xfer) > 0) {
    - purple_xfer_set_status(xfer, PURPLE_XFER_STATUS_CANCEL_REMOTE);
    - purple_xfer_end(xfer);
    - } else {
    - purple_xfer_set_completed(xfer, TRUE);
    - purple_xfer_end(xfer);
    - }
    -}
    -
    -static void
    -jabber_oob_xfer_writer(SoupMessage *msg, SoupBuffer *chunk, gpointer user_data)
    -{
    - PurpleXfer *xfer = user_data;
    -
    - if (!purple_xfer_write_file(xfer, (const guchar *)chunk->data,
    - chunk->length)) {
    - JabberOOBXfer *jox = JABBER_OOB_XFER(xfer);
    - soup_session_cancel_message(jox->js->http_conns, msg,
    - SOUP_STATUS_IO_ERROR);
    - }
    -}
    -#endif
    -
    static void jabber_oob_xfer_start(PurpleXfer *xfer)
    {
    SoupMessage *msg;
    @@ -196,16 +156,8 @@
    soup_message_add_header_handler(
    msg, "got-headers", "Content-Length",
    G_CALLBACK(jabber_oob_xfer_got_content_length), xfer);
    -#if SOUP_MAJOR_VERSION >= 3
    soup_session_send_async(jox->js->http_conns, msg, G_PRIORITY_DEFAULT,
    jox->cancellable, jabber_oob_xfer_send_cb, xfer);
    -#else
    - soup_message_body_set_accumulate(msg->response_body, FALSE);
    - g_signal_connect(msg, "got-chunk", G_CALLBACK(jabber_oob_xfer_writer),
    - xfer);
    - soup_session_queue_message(jox->js->http_conns, msg, jabber_oob_xfer_got,
    - xfer);
    -#endif
    }
    static void jabber_oob_xfer_recv_error(PurpleXfer *xfer, const char *code) {
    @@ -237,12 +189,7 @@
    static void jabber_oob_xfer_recv_cancelled(PurpleXfer *xfer) {
    JabberOOBXfer *jox = JABBER_OOB_XFER(xfer);
    -#if SOUP_MAJOR_VERSION >= 3
    g_cancellable_cancel(jox->cancellable);
    -#else
    - soup_session_cancel_message(jox->js->http_conns, jox->msg,
    - SOUP_STATUS_CANCELLED);
    -#endif
    jabber_oob_xfer_recv_error(xfer, "404");
    }
    @@ -295,9 +242,7 @@
    static void
    jabber_oob_xfer_init(JabberOOBXfer *xfer) {
    -#if SOUP_MAJOR_VERSION >= 3
    xfer->cancellable = g_cancellable_new();
    -#endif
    }
    static void