I'm not a GTK+ expert at all, that's why I didn'y dive in the documentation and just applied the changes from #645 with preprocessing conditionals.
Therefore thanks for putting time in it even though it wasn't your PR originally :+1: Once the others agree to merge it, the only thing left to do would be to squash the commits into one.