qulogic/pidgin

irc: Port to use refactored PurpleQueuedOutputStream

2017-06-19, Mike Ruprecht
b88f98cd9ba5
Parents 7119cb1afdb8
Children 7c8688913c87
irc: Port to use refactored PurpleQueuedOutputStream

This patch ports the IRC prpl to use the refactored
PurpleQueuedOutputStream.
1 files changed, 8 insertions(+), 11 deletions(-)
  • +8 -11
    libpurple/protocols/irc/irc.c
    • --- a/libpurple/protocols/irc/irc.c Mon May 28 15:41:02 2018 -0500
    +++ b/libpurple/protocols/irc/irc.c Mon Jun 19 20:18:30 2017 -0500
    @@ -96,16 +96,19 @@
    }
    static void
    -irc_flush_cb(GObject *source, GAsyncResult *res, gpointer data)
    +irc_push_bytes_cb(GObject *source, GAsyncResult *res, gpointer data)
    {
    + PurpleQueuedOutputStream *stream = PURPLE_QUEUED_OUTPUT_STREAM(source);
    PurpleConnection *gc = data;
    gboolean result;
    GError *error = NULL;
    - result = g_output_stream_flush_finish(G_OUTPUT_STREAM(source),
    + result = purple_queued_output_stream_push_bytes_finish(stream,
    res, &error);
    if (!result) {
    + purple_queued_output_stream_clear_queue(stream);
    +
    g_prefix_error(&error, _("Lost connection with server: "));
    purple_connection_take_error(gc, error);
    return;
    @@ -137,17 +140,11 @@
    len = strlen(tosend);
    data = g_bytes_new_take(tosend, len);
    - purple_queued_output_stream_push_bytes(irc->output, data);
    + purple_queued_output_stream_push_bytes_async(irc->output, data,
    + G_PRIORITY_DEFAULT, irc->cancellable, irc_push_bytes_cb,
    + purple_account_get_connection(irc->account));
    g_bytes_unref(data);
    - if (!g_output_stream_has_pending(G_OUTPUT_STREAM(irc->output))) {
    - /* Connection idle. Flush data. */
    - g_output_stream_flush_async(G_OUTPUT_STREAM(irc->output),
    - G_PRIORITY_DEFAULT, irc->cancellable,
    - irc_flush_cb,
    - purple_account_get_connection(irc->account));
    - }
    -
    return len;
    }