Changes required for gtk3 upgrade