diff -r 71898cf4d20f -r 361c801c4536 libpurple/protocols/simple/simple.c --- a/libpurple/protocols/simple/simple.c Thu Jun 29 23:14:26 2017 -0500 +++ b/libpurple/protocols/simple/simple.c Thu Jun 15 13:33:02 2017 -0500 @@ -1766,7 +1766,7 @@ conn = connection_create(sip, source); - sip->registertimeout = purple_timeout_add(g_random_int_range(10000, 100000), (GSourceFunc)subscribe_timeout, sip); + sip->registertimeout = g_timeout_add(g_random_int_range(10000, 100000), (GSourceFunc)subscribe_timeout, sip); do_register(sip); @@ -1808,8 +1808,8 @@ sip->listenpa = purple_input_add(sip->fd, PURPLE_INPUT_READ, simple_udp_process, sip->gc); - sip->resendtimeout = purple_timeout_add(2500, (GSourceFunc) resend_timeout, sip); - sip->registertimeout = purple_timeout_add(g_random_int_range(10000, 100000), (GSourceFunc)subscribe_timeout, sip); + sip->resendtimeout = g_timeout_add(2500, (GSourceFunc) resend_timeout, sip); + sip->registertimeout = g_timeout_add(g_random_int_range(10000, 100000), (GSourceFunc)subscribe_timeout, sip); do_register(sip); } @@ -2051,9 +2051,9 @@ if (sip->tx_handler) purple_input_remove(sip->tx_handler); if (sip->resendtimeout) - purple_timeout_remove(sip->resendtimeout); + g_source_remove(sip->resendtimeout); if (sip->registertimeout) - purple_timeout_remove(sip->registertimeout); + g_source_remove(sip->registertimeout); g_cancellable_cancel(sip->cancellable); g_object_unref(G_OBJECT(sip->cancellable));