[nautilus/wip/csoriano/destktop-split2: 11/33] files-view: remove unused merge/unmerge menus vfunc

[Carlos Soriano Sánchez <csoriano src gnome org>]

commit e104ed8732df5d8f6033ac7bf5b1b8ff05e09a3a
Author: Carlos Soriano <csoriano gnome org>
Date:   Fri Mar 18 13:58:39 2016 +0100

    files-view: remove unused merge/unmerge menus vfunc

 src/nautilus-empty-view.c |    7 -------
 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 5f42620..999e4c2 100644
--- a/src/nautilus-empty-view.c
+++ b/src/nautilus-empty-view.c
@@ -129,12 +129,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);
@@ -256,7 +250,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 4fb1c52..645ead4 100644
--- a/src/nautilus-files-view.h
+++ b/src/nautilus-files-view.h
@@ -202,13 +202,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,