[geary] (72 commits) Non-fast-forward update to branch mjog/mail-merge-plugin

[Michael Gratton <mjog src gnome org>]

The branch 'mjog/mail-merge-plugin' was changed in a way that was not a fast-forward update.
NOTE: This may cause problems for people pulling from the branch. For more information,
please see:

 https://wiki.gnome.org/Git/Help/NonFastForward

Commits removed from the branch:

  7be73a3... Plugins: Add initial MailMerge plugin outline
  850fe15... Application.PluginManager: Update plugin settings for depen
  6e92246... Components.PreferencesWindow: Update plugin rows when deps 
  93c1ce2... Components.InfoBarStack: Support additional stack queue alg
  c36b1d7... Plugins: Actually implement info bar plugin priority
  963c088... Trivial doc comment update
  e3e1c56... Geary.EmailHeaderSet: Seal setting properties off from sub-
  bb836ff... Util.Email.strip_subject_prefixes: Convert param to EmailHe
  1980828... Plugin.Email: Mark Geary.EmailHeaderSet as a prerequisite
  ce2bfbc... Plugin.Email: Add load_body_as method and implement it
  62d1f4e... Plugin.MailMerge: Implement basic merge field parsing
  6ca890c... Plugin.MailMerge: Add simple CSV reader with unit tests
  b32b4d8... src/client/plugin/mail-merge/meson.build: Fix rpath on wron
  81916d5... Application.PluginManager: Rework context state management
  7e5bd9c... Application.Controller: Rework composer life-cycle, again
  1bdba27... Plugins: Update to new composer lifecycle
  44c9d7c... Plugin.Button: Rename to Actionable
  dc546e9... Plugin.Composer: Support registering composer menu items
  7c308c0... vala-unit: Minor test fixups
  8e7024d... Plugins.MailMerge: Initial composer mail merge support
  08a8ea6... src/client: Misc minor build warning and doc comment update
  4c36b2a... Plugin.ActionBar: New class added for plugins that use acti
  1ad4e98... Composer.Widget: Place composer action bars into their own 
  72846b4... Plugin.Composer: Support plugins for providing composer act
  28da73f... Plugin.MailMerge: Show a composer action bar after loading 
  51e5775... Composer.Widget: Make editor prop public
  102a640... Composer.Widget: Add focused_input_widget property
  97f629c... Plugin.Composer: Add new action_group_name property
  2de4b46... Plugin.Composer: Add insert_text method
  866025d... Plugin.MailMerge: Add composer action bar menu for insertin
  27281b7... Plugin.MailMerge: Add some missing comments to translators
  96c4a07... Application.AccountContext: Make folder context methods pub
  a2614b7... Application, Plugin: Make object conversion methods consist
  ef51a1b... Sidebar.Branch: Remove some harmless asserts
  0c2e454... Plugin.MailMergeFolder: New virtual folder for displaying m
  3f30ebc... Plugin.MailMerge: Allow CSV chooser to be re-used
  5cbb1ce... Plugin.MailMerge: Show merge virtual folder when merging
  1f84b0c... Geary.Folder: Add new contains_identifiers method
  2f7d620... Geary.Account: Add {de}register_local_folder methods
  31c5909... Application.MainWindow: Fix custom folder path showing in w
  7bb1010... Fix valadoc warning
  e65298c... Geary.RFC822.MailboxAddresses: Update append methods
  02c93b8... Plugin.MailMerge: Register folder with the engine rather th
  4d0d3ee... Plugin.MailMergeFolder: Load messages from template into th
  fac5e7a... Plugin.MailMerge: Move merge field code from plugin to stan
  803302c... MailMerge: Break test source file into separate driver and 
  afe53f4... MailMerge: Put non-plugin classes in own namespace, rename 
  27dbd52... MailMerge.Processor: Add field parser object, use in `conta
  cec9484... MailMerge: Implement initial email merging
  aaf5800... Sidebar.Branch: Fix assert when removing a folder
  5947b9e... Application.MainWindow: Select another folder is when selec
  acb9f92... Sidebar.Branch: Fix compiler warning, improve code style
  8e473ab... Plugin.Infobar: Allow plugins to be notified of close butto
  8dd1484... Plugin.InfoBar: Enable plugins to dynamically update info b
  aca958d... Plugin.Actionable: Support specifying icons
  aed55ce... Plugin.MailMerge: Add info bar to merge folder with status 
  8813e57... Geary.ComposedEmail: Allow send date to be updated
  1f2430b... MailMerge.Folder: Add skeleton properties for accessing fol
  3ae9ed8... MailMerge.Folder: Update backing collections
  050ab58... MailMerge.Folder: Implement sending merged email

Commits added to the branch:

  9bd8551... Updated Spanish translation (*)
  2dc73ab... Update Japanese translation (*)
  817bc7f... Update Japanese translation (*)
  c37cf06... Plugin.Application: Add support for reporting problems (*)
  4411e00... Merge branch 'mjog/plugin-problem-reports' into 'mainline' (*)
  10c7ab1... Plugin.PluginBase: Add `is_startup` parameter to `activate` (*)
  9f5bea3... Plugin.SentSound: Report an error when sound doesn't play (*)
  492d662... Plugin.SentSound: Play a sound on when first activated (*)
  108853a... Merge branch 'mjog/sound-plugin-feedback' into 'mainline' (*)
  850bb31... Fix vala mainline switch statement build warnings (*)
  cb648cd... Merge branch 'mjog/vala-switch-warnings' into 'mainline' (*)
  7311ffe... Plugins: Add initial MailMerge plugin outline
  a655037... Application.PluginManager: Update plugin settings for depen
  911f8ec... Components.PreferencesWindow: Update plugin rows when deps 
  85adc6b... Components.InfoBarStack: Support additional stack queue alg
  ce90574... Plugins: Actually implement info bar plugin priority
  0aeeba1... Trivial doc comment update
  6074610... Geary.EmailHeaderSet: Seal setting properties off from sub-
  efc5c3b... Util.Email.strip_subject_prefixes: Convert param to EmailHe
  aa80b10... Plugin.Email: Mark Geary.EmailHeaderSet as a prerequisite
  8ba6838... Plugin.Email: Add load_body_as method and implement it
  cc145ab... Plugin.MailMerge: Implement basic merge field parsing
  2c4a73e... Plugin.MailMerge: Add simple CSV reader with unit tests
  6d99cde... src/client/plugin/mail-merge/meson.build: Fix rpath on wron
  f3e6feb... Application.PluginManager: Rework context state management
  c57ae85... Application.Controller: Rework composer life-cycle, again
  78c8a2f... Plugins: Update to new composer lifecycle
  ec44114... Plugin.Button: Rename to Actionable
  41de9e5... Plugin.Composer: Support registering composer menu items
  6ea5e43... vala-unit: Minor test fixups
  9eedaf8... Plugins.MailMerge: Initial composer mail merge support
  0290bf1... src/client: Misc minor build warning and doc comment update
  7230ea4... Plugin.ActionBar: New class added for plugins that use acti
  bde39bf... Composer.Widget: Place composer action bars into their own 
  204adb5... Plugin.Composer: Support plugins for providing composer act
  72f1663... Plugin.MailMerge: Show a composer action bar after loading 
  2159a9a... Composer.Widget: Make editor prop public
  2c7fe7d... Composer.Widget: Add focused_input_widget property
  20dffab... Plugin.Composer: Add new action_group_name property
  5d5f04e... Plugin.Composer: Add insert_text method
  3f5f4a4... Plugin.MailMerge: Add composer action bar menu for insertin
  ee53621... Plugin.MailMerge: Add some missing comments to translators
  c252133... Application.AccountContext: Make folder context methods pub
  b8bbe53... Application, Plugin: Make object conversion methods consist
  c5e31ce... Sidebar.Branch: Remove some harmless asserts
  8d297af... Plugin.MailMergeFolder: New virtual folder for displaying m
  ba0ed1c... Plugin.MailMerge: Allow CSV chooser to be re-used
  77b1683... Plugin.MailMerge: Show merge virtual folder when merging
  9102280... Geary.Folder: Add new contains_identifiers method
  df7a30c... Geary.Account: Add {de}register_local_folder methods
  334c8e0... Application.MainWindow: Fix custom folder path showing in w
  6c94470... Fix valadoc warning
  0d283df... Geary.RFC822.MailboxAddresses: Update append methods
  da9e018... Plugin.MailMerge: Register folder with the engine rather th
  2ce3d8b... Plugin.MailMergeFolder: Load messages from template into th
  a6acf96... Plugin.MailMerge: Move merge field code from plugin to stan
  b1807df... MailMerge: Break test source file into separate driver and 
  67ecf11... MailMerge: Put non-plugin classes in own namespace, rename 
  c89fe7e... MailMerge.Processor: Add field parser object, use in `conta
  c0795fa... MailMerge: Implement initial email merging
  f7ea243... Sidebar.Branch: Fix assert when removing a folder
  4404496... Application.MainWindow: Select another folder is when selec
  c8aeeec... Sidebar.Branch: Fix compiler warning, improve code style
  aae3a1a... Plugin.Infobar: Allow plugins to be notified of close butto
  30e5e5b... Plugin.InfoBar: Enable plugins to dynamically update info b
  44b62ed... Plugin.Actionable: Support specifying icons
  a58e71a... Plugin.MailMerge: Add info bar to merge folder with status 
  7d6078d... Geary.ComposedEmail: Allow send date to be updated
  99bc719... MailMerge.Folder: Add skeleton properties for accessing fol
  d8d8aba... MailMerge.Folder: Update backing collections
  182c498... MailMerge.Folder: Implement sending merged email
  c3c134f... MailMerge.Folder: Throttle sending rate to 30 per minute

(*) This commit already existed in another branch; no separate mail sent