build: Fix build w/o GTK 3 and other clean ups

See the individual commits.

Merge request reports

Loading