gtk+-2.0, gtk+-3.0: port more annotations from the GIR version