[nautilus/wip/antoniof/make-window-slot-final: 16/16] files-view: Make override method private
- From: António Fernandes <antoniof src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus/wip/antoniof/make-window-slot-final: 16/16] files-view: Make override method private
- Date: Fri, 15 Jan 2021 16:46:32 +0000 (UTC)
commit 46f541f03fd66d53aba489690aff559592b0bf3a
Author: António Fernandes <antoniof gnome org>
Date: Fri Jan 15 00:46:49 2021 +0000
files-view: Make override method private
Always call the parent polimorphic method instead.
src/nautilus-files-view.c | 2 +-
src/nautilus-files-view.h | 2 --
src/nautilus-window-slot.c | 4 ++--
3 files changed, 3 insertions(+), 5 deletions(-)
---
diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c
index 1e5d0fd2d..35c0e3155 100644
--- a/src/nautilus-files-view.c
+++ b/src/nautilus-files-view.c
@@ -991,7 +991,7 @@ nautilus_files_view_is_searching (NautilusView *view)
return NAUTILUS_IS_SEARCH_DIRECTORY (priv->model);
}
-guint
+static guint
nautilus_files_view_get_view_id (NautilusView *view)
{
return NAUTILUS_FILES_VIEW_CLASS (G_OBJECT_GET_CLASS (view))->get_view_id (NAUTILUS_FILES_VIEW (view));
diff --git a/src/nautilus-files-view.h b/src/nautilus-files-view.h
index 152f25aa0..5ab47c324 100644
--- a/src/nautilus-files-view.h
+++ b/src/nautilus-files-view.h
@@ -293,8 +293,6 @@ void nautilus_files_view_remove_subdirectory (Nautilu
gboolean nautilus_files_view_is_editable (NautilusFilesView *view);
NautilusWindow * nautilus_files_view_get_window (NautilusFilesView *view);
-guint nautilus_files_view_get_view_id (NautilusView *view);
-
/* file operations */
char * nautilus_files_view_get_backing_uri (NautilusFilesView *view);
void nautilus_files_view_move_copy_items (NautilusFilesView *view,
diff --git a/src/nautilus-window-slot.c b/src/nautilus-window-slot.c
index 23fa4ac94..5ea8bb5de 100644
--- a/src/nautilus-window-slot.c
+++ b/src/nautilus-window-slot.c
@@ -404,7 +404,7 @@ nautilus_window_slot_sync_actions (NautilusWindowSlot *self)
g_simple_action_set_enabled (G_SIMPLE_ACTION (action), NAUTILUS_IS_FILES_VIEW (view));
if (g_action_get_enabled (action))
{
- variant = g_variant_new_uint32 (nautilus_files_view_get_view_id (view));
+ variant = g_variant_new_uint32 (nautilus_view_get_view_id (view));
g_action_change_state (action, variant);
}
action = g_action_map_lookup_action (G_ACTION_MAP (self->slot_action_group), "files-view-mode-toggle");
@@ -1005,7 +1005,7 @@ action_files_view_mode_toggle (GSimpleAction *action,
return;
}
- current_view_id = nautilus_files_view_get_view_id (self->content_view);
+ current_view_id = nautilus_view_get_view_id (self->content_view);
if (current_view_id == NAUTILUS_VIEW_LIST_ID)
{
change_files_view_mode (self, NAUTILUS_VIEW_GRID_ID);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]