[geary: 2/2] Merge branch 'wip/christopherdavis/dual-install' into 'mainline'

[Michael Gratton <mjog src gnome org>]

commit b9cbe81e123e738799bb608f5cced0a30d340971
Merge: f6e97db5 bfcee9bf
Author: Michael Gratton <mike vee net>
Date:   Wed Aug 28 09:10:14 2019 +0000

    Merge branch 'wip/christopherdavis/dual-install' into 'mainline'
    
    build: Set up dual install for flatpak
    
    See merge request GNOME/geary!229

 .gitlab-ci.yml                                     |  4 +-
 ...rt.desktop.in => geary-autostart.desktop.in.in} |  2 +-
 desktop/meson.build                                | 62 +++++++++++++++-------
 ...ta.xml.in => org.gnome.Geary.appdata.xml.in.in} |  6 +--
 ...ry.desktop.in => org.gnome.Geary.desktop.in.in} |  2 +-
 desktop/org.gnome.Geary.service.in                 |  2 +-
 icons/meson.build                                  | 17 ++++--
 meson.build                                        | 31 ++++++++---
 meson_options.txt                                  |  7 +++
 org.gnome.Geary.json                               |  5 +-
 src/client/accounts/accounts-editor-list-pane.vala |  4 ++
 src/client/accounts/accounts-editor.vala           |  1 +
 src/client/application/geary-application.vala      | 49 ++++-------------
 src/client/application/secret-mediator.vala        |  2 +-
 src/client/components/main-window.vala             |  5 ++
 src/client/notification/unity-launcher.vala        |  2 +-
 src/console/main.vala                              |  3 +-
 src/engine/meson.build                             |  1 -
 src/geary-version.vala.in                          | 18 -------
 src/meson.build                                    | 16 ------
 .../application/geary-configuration-test.vala      |  2 +-
 .../components/client-web-view-test-case.vala      |  2 +-
 test/client/components/client-web-view-test.vala   |  2 +-
 ui/accounts_editor.ui                              |  1 -
 ui/accounts_editor_list_pane.ui                    |  3 +-
 ui/main-toolbar.ui                                 |  1 +
 26 files changed, 128 insertions(+), 122 deletions(-)
---
diff --cc src/client/application/geary-application.vala
index 59b1db5c,17992c8d..77307393
--- a/src/client/application/geary-application.vala
+++ b/src/client/application/geary-application.vala
@@@ -706,13 -680,12 +680,12 @@@ public class GearyApplication : Gtk.App
  
          bool first_run = false;
          try {
 -            int mutex_token = yield this.controler_mutex.claim_async();
 +            int mutex_token = yield this.controller_mutex.claim_async();
              if (this.controller == null) {
                  message(
-                     "%s %s (%s) prefix=%s exec_dir=%s is_installed=%s",
+                     "%s %s prefix=%s exec_dir=%s is_installed=%s",
                      NAME,
                      VERSION,
-                     Geary.Version.ID,
                      INSTALL_PREFIX,
                      exec_dir.get_path(),
                      this.is_installed.to_string()