[nautilus] files-view: obsolete restoring default zoom level

[Ernestas Kulik <ernestask src gnome org>]

commit b8e97788cd8ce13004fc2999304cfb15dcb5cf91
Author: Ernestas Kulik <ernestask src gnome org>
Date:   Thu Jun 9 12:06:18 2016 +0300

    files-view: obsolete restoring default zoom level
    
    Restoring to the default zoom level does not work anymore, as Nautilus
    sets the default level to the current one. This commit removes the
    restore functionality.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=763948

 src/nautilus-canvas-view.c |   13 -------------
 src/nautilus-empty-view.c  |    6 ------
 src/nautilus-files-view.c  |   32 --------------------------------
 src/nautilus-files-view.h  |    5 -----
 src/nautilus-list-view.c   |    9 ---------
 5 files changed, 0 insertions(+), 65 deletions(-)
---
diff --git a/src/nautilus-canvas-view.c b/src/nautilus-canvas-view.c
index 8480a91..8a618d3 100644
--- a/src/nautilus-canvas-view.c
+++ b/src/nautilus-canvas-view.c
@@ -793,18 +793,6 @@ nautilus_canvas_view_bump_zoom_level (NautilusFilesView *view, int zoom_incremen
 }
 
 static void
-nautilus_canvas_view_restore_default_zoom_level (NautilusFilesView *view)
-{
-       NautilusCanvasView *canvas_view;
-
-       g_return_if_fail (NAUTILUS_IS_CANVAS_VIEW (view));
-
-       canvas_view = NAUTILUS_CANVAS_VIEW (view);
-       nautilus_canvas_view_zoom_to_level
-               (view, get_default_zoom_level (canvas_view));
-}
-
-static void
 nautilus_canvas_view_restore_standard_zoom_level (NautilusFilesView *view)
 {
         nautilus_canvas_view_zoom_to_level (view, NAUTILUS_CANVAS_ZOOM_LEVEL_LARGE);
@@ -1844,7 +1832,6 @@ nautilus_canvas_view_class_init (NautilusCanvasViewClass *klass)
        nautilus_files_view_class->get_selection_for_file_transfer = nautilus_canvas_view_get_selection;
        nautilus_files_view_class->is_empty = nautilus_canvas_view_is_empty;
        nautilus_files_view_class->remove_file = nautilus_canvas_view_remove_file;
-       nautilus_files_view_class->restore_default_zoom_level = 
nautilus_canvas_view_restore_default_zoom_level;
         nautilus_files_view_class->restore_standard_zoom_level = 
nautilus_canvas_view_restore_standard_zoom_level;
        nautilus_files_view_class->reveal_selection = nautilus_canvas_view_reveal_selection;
        nautilus_files_view_class->select_all = nautilus_canvas_view_select_all;
diff --git a/src/nautilus-empty-view.c b/src/nautilus-empty-view.c
index 97c9ce7..5e7c6a7 100644
--- a/src/nautilus-empty-view.c
+++ b/src/nautilus-empty-view.c
@@ -151,11 +151,6 @@ nautilus_empty_view_zoom_to_level (NautilusFilesView *view,
 }
 
 static void
-nautilus_empty_view_restore_default_zoom_level (NautilusFilesView *view)
-{
-}
-
-static void
 nautilus_empty_view_restore_standard_zoom_level (NautilusFilesView *view)
 {
 }
@@ -262,7 +257,6 @@ nautilus_empty_view_class_init (NautilusEmptyViewClass *class)
        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->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->restore_standard_zoom_level = 
nautilus_empty_view_restore_standard_zoom_level;
        nautilus_files_view_class->reveal_selection = nautilus_empty_view_reveal_selection;
        nautilus_files_view_class->select_all = nautilus_empty_view_select_all;
diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c
index 4694437..f55d9b8 100644
--- a/src/nautilus-files-view.c
+++ b/src/nautilus-files-view.c
@@ -759,24 +759,6 @@ nautilus_files_view_supports_zooming (NautilusFilesView *view)
 }
 
 /**
- * nautilus_files_view_restore_default_zoom_level:
- *
- * restore to the default zoom level by invoking the relevant subclass through the slot
- *
- **/
-void
-nautilus_files_view_restore_default_zoom_level (NautilusFilesView *view)
-{
-        g_return_if_fail (NAUTILUS_IS_FILES_VIEW (view));
-
-        if (!nautilus_files_view_supports_zooming (view)) {
-                return;
-        }
-
-        NAUTILUS_FILES_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->restore_default_zoom_level (view);
-}
-
-/**
  * nautilus_files_view_restore_standard_zoom_level:
  *
  * Restore the zoom level to 100%
@@ -2367,14 +2349,6 @@ action_zoom_out (GSimpleAction *action,
 }
 
 static void
-action_zoom_default (GSimpleAction *action,
-                     GVariant      *state,
-                     gpointer       user_data)
-{
-        nautilus_files_view_restore_default_zoom_level (user_data);
-}
-
-static void
 action_zoom_standard (GSimpleAction *action,
                       GVariant      *state,
                       gpointer       user_data)
@@ -6039,7 +6013,6 @@ const GActionEntry view_entries[] = {
         /* Toolbar menu */
         { "zoom-in",  action_zoom_in },
         { "zoom-out", action_zoom_out },
-        { "zoom-default", action_zoom_default },
         { "zoom-standard", action_zoom_standard },
         { "show-hidden-files", NULL, NULL, "true", action_show_hidden_files },
         /* Background menu */
@@ -6643,10 +6616,6 @@ real_update_actions_state (NautilusFilesView *view)
         g_simple_action_set_enabled (G_SIMPLE_ACTION (action),
                                      nautilus_files_view_can_zoom_out (view));
         action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group),
-                                             "zoom-default");
-        g_simple_action_set_enabled (G_SIMPLE_ACTION (action),
-                                     nautilus_files_view_supports_zooming (view));
-        action = g_action_map_lookup_action (G_ACTION_MAP (view_action_group),
                                              "zoom-standard");
         g_simple_action_set_enabled (G_SIMPLE_ACTION (action),
                                      nautilus_files_view_supports_zooming (view));
@@ -8355,7 +8324,6 @@ nautilus_files_view_init (NautilusFilesView *view)
         nautilus_application_add_accelerator (app, "view.new-folder", "<control><shift>n");
         /* Only accesible by shorcuts */
         nautilus_application_add_accelerator (app, "view.select-pattern", "<control>s");
-        nautilus_application_add_accelerator (app, "view.zoom-default", "<control>0");
         nautilus_application_add_accelerator (app, "view.invert-selection", "<shift><control>i");
         nautilus_application_add_accelerator (app, "view.open-file-and-close-window", 
"<control><shift>Down");
 
diff --git a/src/nautilus-files-view.h b/src/nautilus-files-view.h
index b76ae6a..e0f8c3c 100644
--- a/src/nautilus-files-view.h
+++ b/src/nautilus-files-view.h
@@ -179,10 +179,6 @@ struct NautilusFilesViewClass {
         void    (* bump_zoom_level)          (NautilusFilesView *view,
                                               int                zoom_increment);
 
-        /* restore_default_zoom_level is a function pointer that subclasses must override
-         * to restore the zoom level of an object to a default setting. */
-        void    (* restore_default_zoom_level) (NautilusFilesView *view);
-
         /*
          * restore_default_zoom_level: restores the zoom level to 100% (or to
          * whatever is considered the 'standard' zoom level for the view). */
@@ -360,7 +356,6 @@ void              nautilus_files_view_bump_zoom_level            (NautilusFilesV
                                                                   int                     zoom_increment);
 void              nautilus_files_view_zoom_to_level              (NautilusFilesView      *view,
                                                                   gint                    level);
-void              nautilus_files_view_restore_default_zoom_level (NautilusFilesView      *view);
 gboolean          nautilus_files_view_can_zoom_in                (NautilusFilesView      *view);
 gboolean          nautilus_files_view_can_zoom_out               (NautilusFilesView      *view);
 void              nautilus_files_view_update_menus               (NautilusFilesView      *view);
diff --git a/src/nautilus-list-view.c b/src/nautilus-list-view.c
index 53d8b7e..9df4ae8 100644
--- a/src/nautilus-list-view.c
+++ b/src/nautilus-list-view.c
@@ -2757,14 +2757,6 @@ nautilus_list_view_bump_zoom_level (NautilusFilesView *view, int zoom_increment)
 }
 
 static void
-nautilus_list_view_restore_default_zoom_level (NautilusFilesView *view)
-{
-       g_return_if_fail (NAUTILUS_IS_LIST_VIEW (view));
-
-       nautilus_list_view_zoom_to_level (view, get_default_zoom_level ());
-}
-
-static void
 nautilus_list_view_restore_standard_zoom_level (NautilusFilesView *view)
 {
         nautilus_list_view_zoom_to_level (view, NAUTILUS_LIST_ZOOM_LEVEL_STANDARD);
@@ -3158,7 +3150,6 @@ nautilus_list_view_class_init (NautilusListViewClass *class)
        nautilus_files_view_class->get_selection_for_file_transfer = 
nautilus_list_view_get_selection_for_file_transfer;
        nautilus_files_view_class->is_empty = nautilus_list_view_is_empty;
        nautilus_files_view_class->remove_file = nautilus_list_view_remove_file;
-       nautilus_files_view_class->restore_default_zoom_level = nautilus_list_view_restore_default_zoom_level;
         nautilus_files_view_class->restore_standard_zoom_level = 
nautilus_list_view_restore_standard_zoom_level;
        nautilus_files_view_class->reveal_selection = nautilus_list_view_reveal_selection;
        nautilus_files_view_class->select_all = nautilus_list_view_select_all;