diff options
| author | Neil Herald <neil.herald@gmail.com> | 2016-05-21 18:34:42 +0100 |
|---|---|---|
| committer | Neil Herald <neil.herald@gmail.com> | 2016-06-22 23:38:23 +0100 |
| commit | 83ca885949386f6514ffc77c3a9c18189cfc6a6a (patch) | |
| tree | 9316160010f556e2d83a73448e66b01a9dbf25d7 /src/nautilus-view.c | |
| parent | 643518079e3c2681b46e8015d8ca2c018d221001 (diff) | |
| download | nautilus-83ca885949386f6514ffc77c3a9c18189cfc6a6a.tar.gz | |
toolbar: change ownership of menu popover to the toolbar
Prior changes to merge the view and action menus essentially moved the
action menu items into the view menu. This was the path of least
resistance; the view has a lot of hooks on items in the view menu,
whereas the there are very few hooks on items in the action menu,
meaning the latter could be moved more easily.
However, previously the view menu was disabled for Other Locations and
the action menu wasn't. So the side effect of the changes is the
remaining menu is now disabled completely on Other Locations. There are
a couple of items that could be shown for Other Locations (e.g. New
Tab), so we still want to show a menu, but this involves some
refactoring so has been deferred until now.
This commit is the first part of the refactoring; the files view owns
the menu popover, meaning that the Other Locations view doesn't have
access to it. This commit moves the ownership of the menu popover to the
toolbar. Future commits will move the common items into the popover so
all views will show them.
https://bugzilla.gnome.org/show_bug.cgi?id=764632
Diffstat (limited to 'src/nautilus-view.c')
| -rw-r--r-- | src/nautilus-view.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/nautilus-view.c b/src/nautilus-view.c index 17916025f..79b9dc4fd 100644 --- a/src/nautilus-view.c +++ b/src/nautilus-view.c @@ -118,7 +118,8 @@ nautilus_view_get_icon (NautilusView *view) * nautilus_view_get_view_widget: * @view: a #NautilusView * - * Retrieves the view menu widget from @view. + * Retrieves the toolbar menu section (widget) from @view, that should be shown + * in the menu when this view is active * * Returns: (transfer none): the widget displayed under view menu. */ |