[geary/mjog/fix-build-warnings: 5/5] Merge branch 'mainline' into 'mjog/fix-build-warnings'

[Michael Gratton <mjog src gnome org>]

commit 72499c182a0731171aba89a0b80658824f549b4d
Merge: f21832821 c4bd8c2b6
Author: Michael Gratton <mike vee net>
Date:   Sun Feb 7 03:53:34 2021 +0000

    Merge branch 'mainline' into 'mjog/fix-build-warnings'
    
    Fix conflicts with switch to Hdy.HeaderBar
    
    # Conflicts:
    #   src/client/components/main-toolbar.vala

 po/pt_BR.po                                        | 1272 +++++++------
 po/sr.po                                           | 1931 +++++++++-----------
 .../components-conversation-header-bar.vala        |    2 +-
 src/client/components/main-toolbar.vala            |    4 +-
 ui/components-conversation-header-bar.ui           |    2 +-
 ui/main-toolbar.ui                                 |    4 +-
 6 files changed, 1562 insertions(+), 1653 deletions(-)
---
diff --cc src/client/components/main-toolbar.vala
index 5e065b325,607c2af3f..cf769546b
--- a/src/client/components/main-toolbar.vala
+++ b/src/client/components/main-toolbar.vala
@@@ -19,24 -19,33 +19,24 @@@ public class MainToolbar : Hdy.Leaflet 
  
      private Components.ConversationActionBar conversation_viewer_action_bar;
  
 -    [GtkChild]
 -    private Hdy.Leaflet conversations_leaflet;
 +    [GtkChild] private unowned Hdy.Leaflet conversations_leaflet;
  
      // Folder header elements
-     [GtkChild] private unowned Gtk.HeaderBar folder_header;
 -    [GtkChild]
 -    private Hdy.HeaderBar folder_header;
 -    [GtkChild]
 -    private Gtk.MenuButton main_menu_button;
++    [GtkChild] private unowned Hdy.HeaderBar folder_header;
 +    [GtkChild] private unowned Gtk.MenuButton main_menu_button;
  
 -    [GtkChild]
 -    private Gtk.Separator folder_separator;
 +    [GtkChild] private unowned Gtk.Separator folder_separator;
  
      // Conversations header elements
-     [GtkChild] private unowned Gtk.HeaderBar conversations_header;
 -    [GtkChild]
 -    private Hdy.HeaderBar conversations_header;
 -    [GtkChild]
 -    private Gtk.ToggleButton search_conversations_button;
++    [GtkChild] private unowned Hdy.HeaderBar conversations_header;
 +    [GtkChild] private unowned Gtk.ToggleButton search_conversations_button;
  
 -    [GtkChild]
 -    private Gtk.Separator conversations_separator;
 +    [GtkChild] private unowned Gtk.Separator conversations_separator;
  
      // Conversation header elements
 -    [GtkChild]
 -    private Components.ConversationHeaderBar conversation_header;
 +    [GtkChild] private unowned Components.ConversationHeaderBar conversation_header;
  
 -    [GtkChild]
 -    private Hdy.HeaderGroup header_group;
 +    [GtkChild] private unowned Hdy.HeaderGroup header_group;
  
      Gtk.SizeGroup conversation_group;