--- a/libpurple/plugins/joinpart.c Thu Jun 29 23:14:26 2017 -0500 +++ b/libpurple/plugins/joinpart.c Thu Jun 15 13:33:02 2017 -0500 @@ -255,7 +255,7 @@ PURPLE_CALLBACK(received_chat_msg_cb), users); /* Cleanup every 5 minutes */ - id = purple_timeout_add_seconds(60 * 5, (GSourceFunc)clean_users_hash, users); + id = g_timeout_add_seconds(60 * 5, (GSourceFunc)clean_users_hash, users); g_object_set_data(G_OBJECT(plugin), "users", users); g_object_set_data(G_OBJECT(plugin), "id", GUINT_TO_POINTER(id)); @@ -270,7 +270,7 @@ * we don't have to worry one will be called after this. */ g_hash_table_destroy((GHashTable *)g_object_get_data(G_OBJECT(plugin), "users")); - purple_timeout_remove(GPOINTER_TO_UINT(g_object_get_data(G_OBJECT(plugin), "id"))); + g_source_remove(GPOINTER_TO_UINT(g_object_get_data(G_OBJECT(plugin), "id"))); return TRUE; }