Merge branch 'wip/236-return-of-the-menubar' into 'master'

Fix the MainWindow's menu bar showing up again

Closes #236

See merge request !115

(cherry picked from commit 963882d8)

b69fec86 Fix the MainWindow's menu bar showing up again.
6 jobs for geary-0.13 in 8 minutes and 33 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Build
passed #220095
fedora

00:04:31

passed #220096
ubuntu

00:04:20

 
  Test
passed #220097
deb-package

00:04:01

failed #220098
flatpak

00:00:21

 
  Deploy
skipped #220099
review
skipped #220100
allowed to fail manual
stop_review
 
Name Stage Failure
failed
flatpak Test
$ flatpak-builder --stop-at=${FLATPAK_MODULE} app ${MANIFEST_PATH}
error: org.gnome.Sdk/x86_64/3.30 not installed
Failed to init: Unable to find sdk org.gnome.Sdk version 3.30
Uploading artifacts...
WARNING: geary-dev.flatpak: no matching files
WARNING: _build/meson-logs/meson-log.txt: no matching files
WARNING: _build/meson-logs/testlog.txt: no matching files
ERROR: No files to upload
ERROR: Job failed: exit code 1