GNOME 45 port (due to Ademar with minor modifications)
Port to GNOME 45 due to Ademar, see !399 (closed). This MR just adds some minor modifications to clean up the code.
Port to GNOME 45 due to Ademar, see !399 (closed). This MR just adds some minor modifications to clean up the code.