patches applied to yi / gtk /