diff options
| author | Christian Neumair <cneumair@gnome.org> | 2008-05-01 20:10:31 +0000 |
|---|---|---|
| committer | Christian Neumair <cneumair@src.gnome.org> | 2008-05-01 20:10:31 +0000 |
| commit | f6e19ec5426a1bde6521d92158881d0ba0ac8775 (patch) | |
| tree | 209f1e287691c1ad61636f531d66665a6b23a646 | |
| parent | 5535a789cb08ae82c3fcff0a37bddad42a4042f3 (diff) | |
| download | nautilus-f6e19ec5426a1bde6521d92158881d0ba0ac8775.tar.gz | |
Do not update menus if not active, instead of asserting activeness.
2008-05-01 Christian Neumair <cneumair@gnome.org>
* src/file-manager/fm-directory-view.c
(fm_directory_view_update_menus):
Do not update menus if not active, instead of asserting activeness.
Sometimes menu updates are triggered due to inactive views, and not due
to user interaction.
svn path=/branches/multiview/; revision=14124
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | src/file-manager/fm-directory-view.c | 5 |
2 files changed, 12 insertions, 1 deletions
@@ -1,5 +1,13 @@ 2008-05-01 Christian Neumair <cneumair@gnome.org> + * src/file-manager/fm-directory-view.c + (fm_directory_view_update_menus): + Do not update menus if not active, instead of asserting activeness. + Sometimes menu updates are triggered due to inactive views, and not due + to user interaction. + +2008-05-01 Christian Neumair <cneumair@gnome.org> + * src/file-manager/fm-actions.h: * src/file-manager/fm-directory-view.c (action_open_new_tab_callback), (open_one_in_new_tab), diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c index f4ebe29a3..0b8b3e094 100644 --- a/src/file-manager/fm-directory-view.c +++ b/src/file-manager/fm-directory-view.c @@ -8179,7 +8179,10 @@ fm_directory_view_update_menus (FMDirectoryView *view) { g_return_if_fail (FM_IS_DIRECTORY_VIEW (view)); - g_assert (view->details->active); + if (!view->details->active) { + return; + } + EEL_CALL_METHOD (FM_DIRECTORY_VIEW_CLASS, view, |