pidgin/pidgin

Use g_clear_handle_id everywhere

13 months ago, Elliott Sales de Andrade
4185b4043214
Parents c8bf9a5663b1
Children 8f7b46f497c6
Use g_clear_handle_id everywhere

Testing Done:
Compiled and ran tests in valgrind.

Reviewed at https://reviews.imfreedom.org/r/2374/
30 files changed, 73 insertions(+), 209 deletions(-)
  • +8 -20
    finch/gntblist.c
  • +2 -4
    finch/gntconn.c
  • +2 -4
    libpurple/accounts.c
  • +2 -3
    libpurple/buddylist.c
  • +1 -4
    libpurple/connection.c
  • +3 -9
    libpurple/idle.c
  • +4 -18
    libpurple/mediamanager.c
  • +2 -3
    libpurple/prefs.c
  • +5 -15
    libpurple/protocols/bonjour/xmpp.c
  • +2 -2
    libpurple/protocols/facebook/data.c
  • +2 -8
    libpurple/protocols/facebook/mqtt.c
  • +1 -4
    libpurple/protocols/gg/edisc.c
  • +3 -8
    libpurple/protocols/gg/gg.c
  • +1 -2
    libpurple/protocols/gg/roster.c
  • +1 -4
    libpurple/protocols/gg/tcpsocket.c
  • +3 -7
    libpurple/protocols/irc/dcc_send.c
  • +1 -2
    libpurple/protocols/irc/irc.c
  • +2 -6
    libpurple/protocols/jabber/bosh.c
  • +1 -2
    libpurple/protocols/jabber/buddy.c
  • +2 -3
    libpurple/protocols/jabber/caps.c
  • +6 -16
    libpurple/protocols/jabber/jabber.c
  • +1 -4
    libpurple/protocols/jabber/ping.c
  • +3 -11
    libpurple/protocols/jabber/si.c
  • +2 -8
    libpurple/purpleconversationmember.c
  • +3 -16
    libpurple/purpleimconversation.c
  • +2 -4
    libpurple/savedstatuses.c
  • +2 -5
    pidgin/gtkmedia.c
  • +2 -3
    pidgin/gtkroomlist.c
  • +2 -8
    pidgin/pidgindebug.c
  • +2 -6
    pidgin/plugins/gestures/stroke-draw.c
    • --- a/finch/gntblist.c Tue Mar 21 00:46:58 2023 -0500
    +++ b/finch/gntblist.c Tue Mar 21 01:59:19 2023 -0500
    @@ -306,9 +306,7 @@
    static void
    finch_blist_node_free(FinchBlistNode *node) {
    - if(node->signed_timer) {
    - g_source_remove(node->signed_timer);
    - }
    + g_clear_handle_id(&node->signed_timer, g_source_remove);
    g_free(node);
    }
    @@ -741,8 +739,7 @@
    * make things easier to add buddies to empty groups (new or old) without having
    * to turn on 'show empty groups' setting */
    ggblist->new_group = g_list_prepend(ggblist->new_group, grp);
    - if (ggblist->new_group_timeout)
    - g_source_remove(ggblist->new_group_timeout);
    + g_clear_handle_id(&ggblist->new_group_timeout, g_source_remove);
    ggblist->new_group_timeout = g_timeout_add_seconds(SHOW_EMPTY_GROUP_TIMEOUT,
    remove_new_empty_group, NULL);
    @@ -1841,13 +1838,11 @@
    {
    purple_signals_disconnect_by_handle(finch_blist_get_handle());
    - if (ggblist->typing)
    - g_source_remove(ggblist->typing);
    + g_clear_handle_id(&ggblist->typing, g_source_remove);
    remove_peripherals(ggblist);
    g_clear_list(&ggblist->tagged, NULL);
    - if (ggblist->new_group_timeout)
    - g_source_remove(ggblist->new_group_timeout);
    + g_clear_handle_id(&ggblist->new_group_timeout, g_source_remove);
    g_clear_list(&ggblist->new_group, NULL);
    ggblist = NULL;
    @@ -2070,9 +2065,7 @@
    gnt_box_give_focus_to_child(GNT_BOX(ggblist->window), ggblist->tree);
    end:
    g_free(escnewmessage);
    - if (ggblist->typing)
    - g_source_remove(ggblist->typing);
    - ggblist->typing = 0;
    + g_clear_handle_id(&ggblist->typing, g_source_remove);
    return FALSE;
    }
    @@ -2119,9 +2112,7 @@
    if ((text[0] == 27 || (text[0] == '\t' && text[1] == '\0')) && ggblist->typing == 0)
    return FALSE;
    - if (ggblist->typing)
    - g_source_remove(ggblist->typing);
    - ggblist->typing = 0;
    + g_clear_handle_id(&ggblist->typing, g_source_remove);
    if (text[0] == '\r' && text[1] == 0)
    {
    @@ -2340,8 +2331,7 @@
    PurpleBlistNode *node = data;
    FinchBlistNode *fnode = g_object_get_data(G_OBJECT(node), UI_DATA);
    - g_source_remove(fnode->signed_timer);
    - fnode->signed_timer = 0;
    + g_clear_handle_id(&fnode->signed_timer, g_source_remove);
    if (!ggblist->manager->can_add_node(node)) {
    node_remove(purple_blist_get_default(), node);
    @@ -2364,9 +2354,7 @@
    return FALSE;
    }
    - if(fnode->signed_timer) {
    - g_source_remove(fnode->signed_timer);
    - }
    + g_clear_handle_id(&fnode->signed_timer, g_source_remove);
    g_object_ref(node);
    fnode->signed_timer = g_timeout_add_seconds(6, (GSourceFunc)buddy_recent_signed_on_off, data);
    --- a/finch/gntconn.c Tue Mar 21 00:46:58 2023 -0500
    +++ b/finch/gntconn.c Tue Mar 21 01:59:19 2023 -0500
    @@ -50,8 +50,7 @@
    {
    FinchAutoRecon *info = data;
    - if (info->timeout != 0)
    - g_source_remove(info->timeout);
    + g_clear_handle_id(&info->timeout, g_source_remove);
    g_free(info);
    }
    @@ -99,8 +98,7 @@
    info->delay = g_random_int_range(INITIAL_RECON_DELAY_MIN, INITIAL_RECON_DELAY_MAX);
    } else {
    info->delay = MIN(2 * info->delay, MAX_RECON_DELAY);
    - if (info->timeout != 0)
    - g_source_remove(info->timeout);
    + g_clear_handle_id(&info->timeout, g_source_remove);
    }
    info->timeout = g_timeout_add_seconds(info->delay, do_signon, account);
    } else {
    --- a/libpurple/accounts.c Tue Mar 21 00:46:58 2023 -0500
    +++ b/libpurple/accounts.c Tue Mar 21 01:59:19 2023 -0500
    @@ -679,10 +679,8 @@
    purple_accounts_uninit(void)
    {
    gpointer handle = purple_accounts_get_handle();
    - if (save_timer != 0)
    - {
    - g_source_remove(save_timer);
    - save_timer = 0;
    + if(save_timer != 0) {
    + g_clear_handle_id(&save_timer, g_source_remove);
    sync_accounts();
    }
    --- a/libpurple/buddylist.c Tue Mar 21 00:46:58 2023 -0500
    +++ b/libpurple/buddylist.c Tue Mar 21 01:59:19 2023 -0500
    @@ -2171,9 +2171,8 @@
    if (purplebuddylist == NULL)
    return;
    - if (save_timer != 0) {
    - g_source_remove(save_timer);
    - save_timer = 0;
    + if(save_timer != 0) {
    + g_clear_handle_id(&save_timer, g_source_remove);
    purple_blist_sync();
    }
    --- a/libpurple/connection.c Tue Mar 21 00:46:58 2023 -0500
    +++ b/libpurple/connection.c Tue Mar 21 01:59:19 2023 -0500
    @@ -837,10 +837,7 @@
    g_clear_object(&priv->account);
    - if(priv->disconnect_timeout > 0) {
    - g_source_remove(priv->disconnect_timeout);
    - priv->disconnect_timeout = 0;
    - }
    + g_clear_handle_id(&priv->disconnect_timeout, g_source_remove);
    G_OBJECT_CLASS(purple_connection_parent_class)->dispose(obj);
    }
    --- a/libpurple/idle.c Tue Mar 21 00:46:58 2023 -0500
    +++ b/libpurple/idle.c Tue Mar 21 01:59:19 2023 -0500
    @@ -282,9 +282,7 @@
    G_GNUC_UNUSED PurplePrefType type,
    G_GNUC_UNUSED gconstpointer val, G_GNUC_UNUSED gpointer data)
    {
    - if (idle_timer)
    - g_source_remove(idle_timer);
    - idle_timer = 0;
    + g_clear_handle_id(&idle_timer, g_source_remove);
    check_idleness_timer(NULL);
    }
    @@ -294,9 +292,7 @@
    time(&last_active_time);
    if (!no_away)
    {
    - if (idle_timer)
    - g_source_remove(idle_timer);
    - idle_timer = 0;
    + g_clear_handle_id(&idle_timer, g_source_remove);
    check_idleness_timer(NULL);
    }
    }
    @@ -373,9 +369,7 @@
    purple_prefs_disconnect_by_handle(purple_idle_get_handle());
    /* Remove the idle timer */
    - if (idle_timer > 0)
    - g_source_remove(idle_timer);
    - idle_timer = 0;
    + g_clear_handle_id(&idle_timer, g_source_remove);
    g_clear_object(&idle_ui);
    }
    --- a/libpurple/mediamanager.c Tue Mar 21 00:46:58 2023 -0500
    +++ b/libpurple/mediamanager.c Tue Mar 21 01:59:19 2023 -0500
    @@ -479,15 +479,8 @@
    info->readable_cb_token = 0;
    info->writable_cb_token = 0;
    - if (info->readable_timer_id) {
    - g_source_remove (info->readable_timer_id);
    - info->readable_timer_id = 0;
    - }
    -
    - if (info->writable_timer_id) {
    - g_source_remove (info->writable_timer_id);
    - info->writable_timer_id = 0;
    - }
    + g_clear_handle_id(&info->readable_timer_id, g_source_remove);
    + g_clear_handle_id(&info->writable_timer_id, g_source_remove);
    g_clear_pointer(&info->current_sample, gst_sample_unref);
    @@ -1582,15 +1575,8 @@
    info->notify (info->user_data);
    }
    - if (info->readable_cb_token) {
    - g_source_remove (info->readable_timer_id);
    - info->readable_cb_token = 0;
    - }
    -
    - if (info->writable_cb_token) {
    - g_source_remove (info->writable_timer_id);
    - info->writable_cb_token = 0;
    - }
    + g_clear_handle_id(&info->readable_cb_token, g_source_remove);
    + g_clear_handle_id(&info->writable_cb_token, g_source_remove);
    if (callbacks) {
    info->callbacks = *callbacks;
    --- a/libpurple/prefs.c Tue Mar 21 00:46:58 2023 -0500
    +++ b/libpurple/prefs.c Tue Mar 21 01:59:19 2023 -0500
    @@ -1478,9 +1478,8 @@
    void
    purple_prefs_uninit(void)
    {
    - if (save_timer != 0)
    - {
    - g_source_remove(save_timer);
    + if(save_timer != 0) {
    + g_clear_handle_id(&save_timer, g_source_remove);
    save_cb(NULL);
    }
    --- a/libpurple/protocols/bonjour/xmpp.c Tue Mar 21 00:46:58 2023 -0500
    +++ b/libpurple/protocols/bonjour/xmpp.c Tue Mar 21 01:59:19 2023 -0500
    @@ -254,8 +254,7 @@
    writelen = purple_circular_buffer_get_max_read(bconv->tx_buf);
    if (writelen == 0) {
    - g_source_remove(bconv->tx_handler);
    - bconv->tx_handler = 0;
    + g_clear_handle_id(&bconv->tx_handler, g_source_remove);
    return;
    }
    @@ -525,8 +524,7 @@
    bconv->stream_data = NULL;
    /* Stream started; process the send buffer if there is one */
    - g_source_remove(bconv->tx_handler);
    - bconv->tx_handler = 0;
    + g_clear_handle_id(&bconv->tx_handler, g_source_remove);
    bconv->sent_stream_start = FULLY_SENT;
    bonjour_xmpp_stream_started(bconv);
    @@ -1187,14 +1185,8 @@
    G_INPUT_STREAM(bconv->input),
    G_OUTPUT_STREAM(bconv->output));
    }
    - if (bconv->rx_handler != 0) {
    - g_source_remove(bconv->rx_handler);
    - bconv->rx_handler = 0;
    - }
    - if (bconv->tx_handler != 0) {
    - g_source_remove(bconv->tx_handler);
    - bconv->tx_handler = 0;
    - }
    + g_clear_handle_id(&bconv->rx_handler, g_source_remove);
    + g_clear_handle_id(&bconv->tx_handler, g_source_remove);
    /* Cancel any pending operations. */
    if (bconv->cancellable != NULL) {
    @@ -1218,9 +1210,7 @@
    bonjour_parser_setup(bconv);
    }
    - if (bconv->close_timeout != 0) {
    - g_source_remove(bconv->close_timeout);
    - }
    + g_clear_handle_id(&bconv->close_timeout, g_source_remove);
    g_free(bconv->buddy_name);
    g_free(bconv->ip);
    --- a/libpurple/protocols/facebook/data.c Tue Mar 21 00:46:58 2023 -0500
    +++ b/libpurple/protocols/facebook/data.c Tue Mar 21 01:59:19 2023 -0500
    @@ -292,8 +292,8 @@
    ptr = g_hash_table_lookup(fata->evs, name);
    id = GPOINTER_TO_UINT(ptr);
    - if ((id > 0) && remove) {
    - g_source_remove(id);
    + if(remove) {
    + g_clear_handle_id(&id, g_source_remove);
    }
    g_hash_table_remove(fata->evs, name);
    --- a/libpurple/protocols/facebook/mqtt.c Tue Mar 21 00:46:58 2023 -0500
    +++ b/libpurple/protocols/facebook/mqtt.c Tue Mar 21 01:59:19 2023 -0500
    @@ -217,10 +217,7 @@
    {
    g_return_if_fail(FB_IS_MQTT(mqtt));
    - if(mqtt->tev > 0) {
    - g_source_remove(mqtt->tev);
    - mqtt->tev = 0;
    - }
    + g_clear_handle_id(&mqtt->tev, g_source_remove);
    if(mqtt->cancellable != NULL) {
    g_cancellable_cancel(mqtt->cancellable);
    @@ -303,10 +300,7 @@
    static void
    fb_mqtt_timeout_clear(FbMqtt *mqtt)
    {
    - if(mqtt->tev > 0) {
    - g_source_remove(mqtt->tev);
    - mqtt->tev = 0;
    - }
    + g_clear_handle_id(&mqtt->tev, g_source_remove);
    }
    static void
    --- a/libpurple/protocols/gg/edisc.c Tue Mar 21 00:46:58 2023 -0500
    +++ b/libpurple/protocols/gg/edisc.c Tue Mar 21 01:59:19 2023 -0500
    @@ -1467,10 +1467,7 @@
    #endif
    g_clear_object(&edisc_xfer->msg);
    - if(edisc_xfer->handler) {
    - g_source_remove(edisc_xfer->handler);
    - edisc_xfer->handler = 0;
    - }
    + g_clear_handle_id(&edisc_xfer->handler, g_source_remove);
    if (edisc_xfer->ticket_id != NULL) {
    g_hash_table_remove(sdata->xfers_initialized,
    --- a/libpurple/protocols/gg/gg.c Tue Mar 21 00:46:58 2023 -0500
    +++ b/libpurple/protocols/gg/gg.c Tue Mar 21 01:59:19 2023 -0500
    @@ -516,8 +516,7 @@
    purple_debug_info("gg", "login_handler: session: check = %d; state = %d;\n",
    info->session->check, info->session->state);
    - g_source_remove(info->inpa);
    - info->inpa = 0;
    + g_clear_handle_id(&info->inpa, g_source_remove);
    /** XXX I think that this shouldn't be done if ev->type is GG_EVENT_CONN_FAILED or GG_EVENT_CONN_SUCCESS -datallah */
    if (info->session->fd >= 0)
    @@ -550,10 +549,7 @@
    }
    break;
    case GG_EVENT_CONN_FAILED:
    - if (info->inpa > 0) {
    - g_source_remove(info->inpa);
    - info->inpa = 0;
    - }
    + g_clear_handle_id(&info->inpa, g_source_remove);
    purple_debug_info("gg", "Connection failure: %d\n",
    ev->event.failure);
    switch (ev->event.failure) {
    @@ -909,8 +905,7 @@
    ggp_message_cleanup(gc);
    ggp_edisc_cleanup(gc);
    - if (info->inpa > 0)
    - g_source_remove(info->inpa);
    + g_clear_handle_id(&info->inpa, g_source_remove);
    g_free(info->imtoken);
    if (info->http) {
    --- a/libpurple/protocols/gg/roster.c Tue Mar 21 00:46:58 2023 -0500
    +++ b/libpurple/protocols/gg/roster.c Tue Mar 21 01:59:19 2023 -0500
    @@ -239,8 +239,7 @@
    {
    ggp_roster_session_data *rdata = ggp_roster_get_rdata(gc);
    - if (rdata->timer)
    - g_source_remove(rdata->timer);
    + g_clear_handle_id(&rdata->timer, g_source_remove);
    ggp_roster_content_free(rdata->content);
    g_list_free_full(rdata->sent_updates, ggp_roster_change_free);
    g_list_free_full(rdata->pending_updates, ggp_roster_change_free);
    --- a/libpurple/protocols/gg/tcpsocket.c Tue Mar 21 00:46:58 2023 -0500
    +++ b/libpurple/protocols/gg/tcpsocket.c Tue Mar 21 01:59:19 2023 -0500
    @@ -115,10 +115,7 @@
    info = purple_connection_get_protocol_data(data->gc);
    - if (info->inpa > 0) {
    - g_source_remove(info->inpa);
    - info->inpa = 0;
    - }
    + g_clear_handle_id(&info->inpa, g_source_remove);
    if (info->session->fd < 0)
    return;
    --- a/libpurple/protocols/irc/dcc_send.c Tue Mar 21 00:46:58 2023 -0500
    +++ b/libpurple/protocols/irc/dcc_send.c Tue Mar 21 01:59:19 2023 -0500
    @@ -173,8 +173,7 @@
    return;
    else if (len <= 0) {
    /* XXX: Shouldn't this be canceling the transfer? */
    - g_source_remove(xd->inpa);
    - xd->inpa = 0;
    + g_clear_handle_id(&xd->inpa, g_source_remove);
    return;
    }
    @@ -203,8 +202,7 @@
    }
    if ((goffset)acked >= purple_xfer_get_size(xfer)) {
    - g_source_remove(xd->inpa);
    - xd->inpa = 0;
    + g_clear_handle_id(&xd->inpa, g_source_remove);
    purple_xfer_set_completed(xfer, TRUE);
    purple_xfer_end(xfer);
    return;
    @@ -387,9 +385,7 @@
    g_socket_service_stop(xfer->service);
    }
    g_clear_object(&xfer->service);
    - if(xfer->inpa > 0) {
    - g_source_remove(xfer->inpa);
    - }
    + g_clear_handle_id(&xfer->inpa, g_source_remove);
    g_clear_object(&xfer->conn);
    G_OBJECT_CLASS(irc_xfer_parent_class)->finalize(obj);
    --- a/libpurple/protocols/irc/irc.c Tue Mar 21 00:46:58 2023 -0500
    +++ b/libpurple/protocols/irc/irc.c Tue Mar 21 01:59:19 2023 -0500
    @@ -708,8 +708,7 @@
    g_clear_object(&irc->output);
    g_clear_object(&irc->conn);
    - if (irc->timer)
    - g_source_remove(irc->timer);
    + g_clear_handle_id(&irc->timer, g_source_remove);
    g_hash_table_destroy(irc->cmds);
    g_hash_table_destroy(irc->msgs);
    g_hash_table_destroy(irc->buddies);
    --- a/libpurple/protocols/jabber/bosh.c Tue Mar 21 00:46:58 2023 -0500
    +++ b/libpurple/protocols/jabber/bosh.c Tue Mar 21 01:59:19 2023 -0500
    @@ -155,8 +155,7 @@
    jabber_bosh_connection_send_now(conn);
    }
    - if (conn->send_timer)
    - g_source_remove(conn->send_timer);
    + g_clear_handle_id(&conn->send_timer, g_source_remove);
    soup_session_abort(conn->payload_reqs);
    @@ -295,10 +294,7 @@
    g_return_if_fail(conn != NULL);
    - if (conn->send_timer != 0) {
    - g_source_remove(conn->send_timer);
    - conn->send_timer = 0;
    - }
    + g_clear_handle_id(&conn->send_timer, g_source_remove);
    if (conn->sid == NULL)
    return;
    --- a/libpurple/protocols/jabber/buddy.c Tue Mar 21 00:46:58 2023 -0500
    +++ b/libpurple/protocols/jabber/buddy.c Tue Mar 21 01:59:19 2023 -0500
    @@ -705,8 +705,7 @@
    static void jabber_buddy_info_destroy(JabberBuddyInfo *jbi)
    {
    /* Remove the timeout, which would otherwise trigger jabber_buddy_get_info_timeout() */
    - if (jbi->timeout_handle > 0)
    - g_source_remove(jbi->timeout_handle);
    + g_clear_handle_id(&jbi->timeout_handle, g_source_remove);
    g_slist_free(jbi->ids);
    g_free(jbi->jid);
    --- a/libpurple/protocols/jabber/caps.c Tue Mar 21 00:46:58 2023 -0500
    +++ b/libpurple/protocols/jabber/caps.c Tue Mar 21 01:59:19 2023 -0500
    @@ -202,9 +202,8 @@
    void jabber_caps_uninit(void)
    {
    - if (save_timer != 0) {
    - g_source_remove(save_timer);
    - save_timer = 0;
    + if(save_timer != 0) {
    + g_clear_handle_id(&save_timer, g_source_remove);
    do_jabber_caps_store(NULL);
    }
    g_clear_pointer(&capstable, g_hash_table_destroy);
    --- a/libpurple/protocols/jabber/jabber.c Tue Mar 21 00:46:58 2023 -0500
    +++ b/libpurple/protocols/jabber/jabber.c Tue Mar 21 01:59:19 2023 -0500
    @@ -701,8 +701,7 @@
    GIOStream *tls_conn;
    GError *error = NULL;
    - g_source_remove(js->inpa);
    - js->inpa = 0;
    + g_clear_handle_id(&js->inpa, g_source_remove);
    js->input = NULL;
    g_filter_output_stream_set_close_base_stream(
    G_FILTER_OUTPUT_STREAM(js->output), FALSE);
    @@ -1009,10 +1008,7 @@
    *
    * jabber_send_raw(js, "</stream:stream>", -1);
    */
    - if(js->inpa) {
    - g_source_remove(js->inpa);
    - js->inpa = 0;
    - }
    + g_clear_handle_id(&js->inpa, g_source_remove);
    purple_gio_graceful_close(js->stream, js->input,
    G_OUTPUT_STREAM(js->output));
    }
    @@ -1053,12 +1049,9 @@
    g_free(js->old_msg);
    g_free(js->old_avatarhash);
    - if (js->keepalive_timeout != 0)
    - g_source_remove(js->keepalive_timeout);
    - if (js->inactivity_timer != 0)
    - g_source_remove(js->inactivity_timer);
    - if (js->conn_close_timeout != 0)
    - g_source_remove(js->conn_close_timeout);
    + g_clear_handle_id(&js->keepalive_timeout, g_source_remove);
    + g_clear_handle_id(&js->inactivity_timer, g_source_remove);
    + g_clear_handle_id(&js->conn_close_timeout, g_source_remove);
    g_cancellable_cancel(js->cancellable);
    g_object_unref(G_OBJECT(js->cancellable));
    @@ -1447,10 +1440,7 @@
    void jabber_stream_restart_inactivity_timer(JabberStream *js)
    {
    - if (js->inactivity_timer != 0) {
    - g_source_remove(js->inactivity_timer);
    - js->inactivity_timer = 0;
    - }
    + g_clear_handle_id(&js->inactivity_timer, g_source_remove);
    g_return_if_fail(js->max_inactivity > 0);
    --- a/libpurple/protocols/jabber/ping.c Tue Mar 21 00:46:58 2023 -0500
    +++ b/libpurple/protocols/jabber/ping.c Tue Mar 21 01:59:19 2023 -0500
    @@ -35,10 +35,7 @@
    G_GNUC_UNUSED PurpleXmlNode *packet,
    G_GNUC_UNUSED gpointer data)
    {
    - if (js->keepalive_timeout != 0) {
    - g_source_remove(js->keepalive_timeout);
    - js->keepalive_timeout = 0;
    - }
    + g_clear_handle_id(&js->keepalive_timeout, g_source_remove);
    }
    void
    --- a/libpurple/protocols/jabber/si.c Tue Mar 21 00:46:58 2023 -0500
    +++ b/libpurple/protocols/jabber/si.c Tue Mar 21 01:59:19 2023 -0500
    @@ -185,10 +185,7 @@
    static void
    jabber_si_bytestreams_ibb_timeout_remove(JabberSIXfer *jsx)
    {
    - if (jsx->ibb_timeout_handle) {
    - g_source_remove(jsx->ibb_timeout_handle);
    - jsx->ibb_timeout_handle = 0;
    - }
    + g_clear_handle_id(&jsx->ibb_timeout_handle, g_source_remove);
    }
    static gboolean
    @@ -1847,13 +1844,8 @@
    jabber_iq_remove_callback_by_id(js, jsx->iq_id);
    }
    - if (jsx->connect_timeout > 0) {
    - g_source_remove(jsx->connect_timeout);
    - }
    -
    - if (jsx->ibb_timeout_handle > 0) {
    - g_source_remove(jsx->ibb_timeout_handle);
    - }
    + g_clear_handle_id(&jsx->connect_timeout, g_source_remove);
    + g_clear_handle_id(&jsx->ibb_timeout_handle, g_source_remove);
    g_list_free_full(jsx->streamhosts, (GDestroyNotify)jabber_bytestreams_streamhost_free);
    --- a/libpurple/purpleconversationmember.c Tue Mar 21 00:46:58 2023 -0500
    +++ b/libpurple/purpleconversationmember.c Tue Mar 21 01:59:19 2023 -0500
    @@ -128,10 +128,7 @@
    g_clear_object(&member->contact_info);
    - if(member->typing_timeout != 0) {
    - g_source_remove(member->typing_timeout);
    - member->typing_timeout = 0;
    - }
    + g_clear_handle_id(&member->typing_timeout, g_source_remove);
    G_OBJECT_CLASS(purple_conversation_member_parent_class)->dispose(obj);
    }
    @@ -246,10 +243,7 @@
    g_return_if_fail(PURPLE_IS_CONVERSATION_MEMBER(member));
    /* Remove an existing timeout if necessary. */
    - if(member->typing_timeout != 0) {
    - g_source_remove(member->typing_timeout);
    - member->typing_timeout = 0;
    - }
    + g_clear_handle_id(&member->typing_timeout, g_source_remove);
    /* If the state has changed, notify. */
    if(state != member->typing_state) {
    --- a/libpurple/purpleimconversation.c Tue Mar 21 00:46:58 2023 -0500
    +++ b/libpurple/purpleimconversation.c Tue Mar 21 01:59:19 2023 -0500
    @@ -274,10 +274,7 @@
    {
    g_return_if_fail(PURPLE_IS_IM_CONVERSATION(im));
    - if(im->typing_timeout > 0) {
    - purple_im_conversation_stop_typing_timeout(im);
    - }
    -
    + purple_im_conversation_stop_typing_timeout(im);
    im->typing_timeout =
    g_timeout_add_seconds(timeout, purple_im_conversation_reset_typing_cb,
    im);
    @@ -287,12 +284,7 @@
    purple_im_conversation_stop_typing_timeout(PurpleIMConversation *im) {
    g_return_if_fail(PURPLE_IS_IM_CONVERSATION(im));
    - if(im->typing_timeout == 0) {
    - return;
    - }
    -
    - g_source_remove(im->typing_timeout);
    - im->typing_timeout = 0;
    + g_clear_handle_id(&im->typing_timeout, g_source_remove);
    }
    guint
    @@ -334,12 +326,7 @@
    purple_im_conversation_stop_send_typed_timeout(PurpleIMConversation *im) {
    g_return_if_fail(PURPLE_IS_IM_CONVERSATION(im));
    - if(im->send_typed_timeout == 0) {
    - return;
    - }
    -
    - g_source_remove(im->send_typed_timeout);
    - im->send_typed_timeout = 0;
    + g_clear_handle_id(&im->typing_timeout, g_source_remove);
    }
    guint
    --- a/libpurple/savedstatuses.c Tue Mar 21 00:46:58 2023 -0500
    +++ b/libpurple/savedstatuses.c Tue Mar 21 01:59:19 2023 -0500
    @@ -1261,10 +1261,8 @@
    remove_old_transient_statuses();
    - if (save_timer != 0)
    - {
    - g_source_remove(save_timer);
    - save_timer = 0;
    + if(save_timer != 0) {
    + g_clear_handle_id(&save_timer, g_source_remove);
    sync_statuses();
    }
    --- a/pidgin/gtkmedia.c Tue Mar 21 00:46:58 2023 -0500
    +++ b/pidgin/gtkmedia.c Tue Mar 21 01:59:19 2023 -0500
    @@ -388,9 +388,7 @@
    g_clear_object(&gtkmedia->priv->ui);
    - if (gtkmedia->priv->timeout_id != 0) {
    - g_source_remove(gtkmedia->priv->timeout_id);
    - }
    + g_clear_handle_id(&gtkmedia->priv->timeout_id, g_source_remove);
    g_clear_pointer(&gtkmedia->priv->recv_progressbars, g_hash_table_destroy);
    g_clear_pointer(&gtkmedia->priv->remote_videos, g_hash_table_destroy);
    @@ -768,8 +766,7 @@
    }
    if (purple_media_is_initiator(media, sid, NULL) == FALSE) {
    - if (gtkmedia->priv->timeout_id != 0)
    - g_source_remove(gtkmedia->priv->timeout_id);
    + g_clear_handle_id(&gtkmedia->priv->timeout_id, g_source_remove);
    gtkmedia->priv->request_type |= type;
    gtkmedia->priv->timeout_id = g_timeout_add(500,
    (GSourceFunc)pidgin_request_timeout_cb,
    --- a/pidgin/gtkroomlist.c Tue Mar 21 00:46:58 2023 -0500
    +++ b/pidgin/gtkroomlist.c Tue Mar 21 01:59:19 2023 -0500
    @@ -80,9 +80,6 @@
    if (dialog->roomlist && purple_roomlist_get_in_progress(dialog->roomlist))
    purple_roomlist_cancel_get_list(dialog->roomlist);
    - if (dialog->pg_update_to > 0)
    - g_source_remove(dialog->pg_update_to);
    -
    if (dialog->roomlist) {
    PidginRoomlist *rl = NULL;
    @@ -98,6 +95,8 @@
    g_object_unref(dialog->roomlist);
    }
    + g_clear_handle_id(&dialog->pg_update_to, g_source_remove);
    +
    dialog->progress = NULL;
    }
    --- a/pidgin/pidgindebug.c Tue Mar 21 00:46:58 2023 -0500
    +++ b/pidgin/pidgindebug.c Tue Mar 21 01:59:19 2023 -0500
    @@ -925,14 +925,8 @@
    void
    pidgin_debug_uninit(void)
    {
    - if(pref_callback_id != 0) {
    - purple_prefs_disconnect_callback(pref_callback_id);
    - }
    - pref_callback_id = 0;
    - if(debug_enabled_timer != 0) {
    - g_source_remove(debug_enabled_timer);
    - }
    - debug_enabled_timer = 0;
    + g_clear_handle_id(&pref_callback_id, purple_prefs_disconnect_callback);
    + g_clear_handle_id(&debug_enabled_timer, g_source_remove);
    }
    void *
    --- a/pidgin/plugins/gestures/stroke-draw.c Tue Mar 21 00:46:58 2023 -0500
    +++ b/pidgin/plugins/gestures/stroke-draw.c Tue Mar 21 01:59:19 2023 -0500
    @@ -96,10 +96,7 @@
    {
    last_mouse_position.invalid = TRUE;
    - if (timer_id > 0)
    - g_source_remove (timer_id);
    -
    - timer_id = 0;
    + g_clear_handle_id(&timer_id, g_source_remove);
    if (event != NULL) {
    gdk_seat_ungrab(gdk_event_get_seat(event));
    @@ -158,9 +155,8 @@
    last_mouse_position.invalid = TRUE;
    original_widget = NULL;
    - g_source_remove (timer_id);
    + g_clear_handle_id(&timer_id, g_source_remove);
    gdk_seat_ungrab(gdk_event_get_seat(event));
    - timer_id = 0;
    {
    GtkWidget *history = data;