diff options
| author | Carlos Soriano <csoriano@gnome.org> | 2016-03-18 13:58:39 +0100 |
|---|---|---|
| committer | Carlos Soriano <csoriano@gnome.org> | 2016-04-14 10:35:14 +0200 |
| commit | 8c94bc54f8ff12b6e3591c9e20dfb1f0475e01ba (patch) | |
| tree | d2c34f095405f21cf8eed5a315d9b75c23c323a5 /src | |
| parent | 149d38386790831e39419fafa84eb8d476d1e64c (diff) | |
| download | nautilus-8c94bc54f8ff12b6e3591c9e20dfb1f0475e01ba.tar.gz | |
files-view: remove unused merge/unmerge menus vfunc
https://bugzilla.gnome.org/show_bug.cgi?id=712620
Diffstat (limited to 'src')
| -rw-r--r-- | src/nautilus-empty-view.c | 7 | ||||
| -rw-r--r-- | src/nautilus-files-view.h | 7 |
2 files changed, 0 insertions, 14 deletions
diff --git a/src/nautilus-empty-view.c b/src/nautilus-empty-view.c index a600c88c8..2302c7c9c 100644 --- a/src/nautilus-empty-view.c +++ b/src/nautilus-empty-view.c @@ -128,12 +128,6 @@ nautilus_empty_view_reveal_selection (NautilusFilesView *view) } static void -nautilus_empty_view_merge_menus (NautilusFilesView *view) -{ - NAUTILUS_FILES_VIEW_CLASS (nautilus_empty_view_parent_class)->merge_menus (view); -} - -static void nautilus_empty_view_update_menus (NautilusFilesView *view) { NAUTILUS_FILES_VIEW_CLASS (nautilus_empty_view_parent_class)->update_menus (view); @@ -255,7 +249,6 @@ nautilus_empty_view_class_init (NautilusEmptyViewClass *class) nautilus_files_view_class->get_selection_for_file_transfer = nautilus_empty_view_get_selection_for_file_transfer; nautilus_files_view_class->is_empty = nautilus_empty_view_is_empty; nautilus_files_view_class->remove_file = nautilus_empty_view_remove_file; - nautilus_files_view_class->merge_menus = nautilus_empty_view_merge_menus; nautilus_files_view_class->update_menus = nautilus_empty_view_update_menus; nautilus_files_view_class->restore_default_zoom_level = nautilus_empty_view_restore_default_zoom_level; nautilus_files_view_class->reveal_selection = nautilus_empty_view_reveal_selection; diff --git a/src/nautilus-files-view.h b/src/nautilus-files-view.h index 5378a146c..cbb4de81d 100644 --- a/src/nautilus-files-view.h +++ b/src/nautilus-files-view.h @@ -201,13 +201,6 @@ struct NautilusFilesViewClass { */ void (* reveal_selection) (NautilusFilesView *view); - /* merge_menus is a function pointer that subclasses can override to - * add their own menu items to the window's menu bar. - * If overridden, subclasses must call parent class's function. - */ - void (* merge_menus) (NautilusFilesView *view); - void (* unmerge_menus) (NautilusFilesView *view); - /* update_menus is a function pointer that subclasses can override to * update the sensitivity or wording of menu items in the menu bar. * It is called (at least) whenever the selection changes. If overridden, |