gtk+-2.0, gtk+-3.0: Further syncing with introspection annotations