diff -r 71898cf4d20f -r 361c801c4536 pidgin/gtkstatusbox.c --- a/pidgin/gtkstatusbox.c Thu Jun 29 23:14:26 2017 -0500 +++ b/pidgin/gtkstatusbox.c Thu Jun 15 13:33:02 2017 -0500 @@ -1094,7 +1094,7 @@ /* Reset the status if Escape was pressed */ if (event->keyval == GDK_KEY_Escape) { - purple_timeout_remove(status_box->typing); + g_source_remove(status_box->typing); status_box->typing = 0; #if 0 /* TODO WebKit: Doesn't do this? */ @@ -1112,8 +1112,8 @@ } pidgin_status_box_pulse_typing(status_box); - purple_timeout_remove(status_box->typing); - status_box->typing = purple_timeout_add_seconds(TYPING_TIMEOUT, (GSourceFunc)remove_typing_cb, status_box); + g_source_remove(status_box->typing); + status_box->typing = g_timeout_add_seconds(TYPING_TIMEOUT, (GSourceFunc)remove_typing_cb, status_box); return FALSE; } @@ -2562,7 +2562,7 @@ PIDGIN_WEBVIEW(status_box->webview), TRUE); #endif - purple_timeout_remove(status_box->typing); + g_source_remove(status_box->typing); status_box->typing = 0; activate_currently_selected_status(status_box); @@ -2591,7 +2591,7 @@ DATA_COLUMN, &data, -1); if ((wastyping = (status_box->typing != 0))) - purple_timeout_remove(status_box->typing); + g_source_remove(status_box->typing); status_box->typing = 0; if (gtk_widget_get_sensitive(GTK_WIDGET(status_box))) @@ -2661,7 +2661,7 @@ if (status_box->webview_visible) { gtk_widget_show_all(status_box->vbox); - status_box->typing = purple_timeout_add_seconds(TYPING_TIMEOUT, (GSourceFunc)remove_typing_cb, status_box); + status_box->typing = g_timeout_add_seconds(TYPING_TIMEOUT, (GSourceFunc)remove_typing_cb, status_box); gtk_widget_grab_focus(status_box->webview); #if 0 /* TODO WebKit: Doesn't do this? */ @@ -2718,9 +2718,9 @@ { if (status_box->typing != 0) { pidgin_status_box_pulse_typing(status_box); - purple_timeout_remove(status_box->typing); + g_source_remove(status_box->typing); } - status_box->typing = purple_timeout_add_seconds(TYPING_TIMEOUT, (GSourceFunc)remove_typing_cb, status_box); + status_box->typing = g_timeout_add_seconds(TYPING_TIMEOUT, (GSourceFunc)remove_typing_cb, status_box); } pidgin_status_box_refresh(status_box); }