some build fixes for both gtk+ versions