qulogic/pidgin

facebook: Port to use refactored PurpleQueuedOutputStream

2018-05-28, Mike Ruprecht
7c8688913c87
Parents b88f98cd9ba5
Children 35d3f5c5ffad
facebook: Port to use refactored PurpleQueuedOutputStream

This patch ports the Facebook prpl to use the refactored
PurpleQueuedOutputStream.
1 files changed, 8 insertions(+), 9 deletions(-)
  • +8 -9
    libpurple/protocols/facebook/mqtt.c
    • --- a/libpurple/protocols/facebook/mqtt.c Mon Jun 19 20:18:30 2017 -0500
    +++ b/libpurple/protocols/facebook/mqtt.c Mon May 28 15:46:46 2018 -0500
    @@ -569,13 +569,16 @@
    }
    static void
    -fb_mqtt_cb_flush(GObject *source, GAsyncResult *res, gpointer data)
    +fb_mqtt_cb_push_bytes(GObject *source, GAsyncResult *res, gpointer data)
    {
    + PurpleQueuedOutputStream *stream = PURPLE_QUEUED_OUTPUT_STREAM(source);
    FbMqtt *mqtt = data;
    GError *err = NULL;
    - if (!g_output_stream_flush_finish(G_OUTPUT_STREAM(source),
    + if (!purple_queued_output_stream_push_bytes_finish(stream,
    res, &err)) {
    + purple_queued_output_stream_clear_queue(stream);
    +
    fb_mqtt_take_error(mqtt, err, _("Failed to write data"));
    return;
    }
    @@ -608,14 +611,10 @@
    /* TODO: Would be nice to refactor this to not require copying bytes */
    gbytes = g_bytes_new(bytes->data, bytes->len);
    - purple_queued_output_stream_push_bytes(priv->output, gbytes);
    + purple_queued_output_stream_push_bytes_async(priv->output, gbytes,
    + G_PRIORITY_DEFAULT, priv->cancellable,
    + fb_mqtt_cb_push_bytes, mqtt);
    g_bytes_unref(gbytes);
    -
    - if (!g_output_stream_has_pending(G_OUTPUT_STREAM(priv->output))) {
    - g_output_stream_flush_async(G_OUTPUT_STREAM(priv->output),
    - G_PRIORITY_DEFAULT, priv->cancellable,
    - fb_mqtt_cb_flush, mqtt);
    - }
    }
    static void