[meld/ui-next] filediff: Rename the local-to-filediff-the-widget action group

[Kai Willadsen <kaiw src gnome org>]

commit 2b8e5b40350d619d6009bd4e1d5ca1002f792aff
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sun Feb 17 14:54:10 2019 +1000

    filediff: Rename the local-to-filediff-the-widget action group
    
    This was the cause of a weird problem where no `view`-group actions were
    actually activate-able from the context of FileDiff, because the `view`
    group *on the widget* was found before the `view` group in the window.
    
    We need the group on the window because that's the only way to get
    things to show up in the menu. We want (but don't need) the group on
    the FileDiff widget because it's saner scoping, and it Just Works for
    our status bars.
    
    An example symptom of this was that while you could use the toolbar
    buttons to go to the next change, the shortcut didn't work.

 meld/filediff.py     | 2 +-
 meld/ui/statusbar.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/meld/filediff.py b/meld/filediff.py
index 0d109a9a..86fe49aa 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -268,7 +268,7 @@ class FileDiff(Gtk.VBox, MeldDoc):
         for prop in sourceview_prop_actions:
             action = make_multiobject_property_action(self.textview, prop)
             prop_action_group.add_action(action)
-        self.insert_action_group('view', prop_action_group)
+        self.insert_action_group('view-local', prop_action_group)
 
         # Set up per-view action group for top-level menu insertion
         self.view_action_group = Gio.SimpleActionGroup()
diff --git a/meld/ui/statusbar.py b/meld/ui/statusbar.py
index a806d765..e1158cd0 100644
--- a/meld/ui/statusbar.py
+++ b/meld/ui/statusbar.py
@@ -273,7 +273,7 @@ class MeldStatusBar(Gtk.Statusbar):
         menu = builder.get_object('statusbar-menu')
 
         pop = Gtk.Popover()
-        pop.bind_model(menu, 'view')
+        pop.bind_model(menu, 'view-local')
         pop.set_position(Gtk.PositionType.TOP)
 
         button = MeldStatusMenuButton()