diff options
| author | António Fernandes <antoniof@gnome.org> | 2021-01-13 12:36:36 +0000 |
|---|---|---|
| committer | António Fernandes <antoniof@gnome.org> | 2021-01-15 17:00:07 +0000 |
| commit | 2b8ede345aed8e0b3f94fa0b0a1054147b0625c3 (patch) | |
| tree | 948d7b4df760299204084abbfd9befbdedcdb4fe | |
| parent | 72acb6bd41a684e6fe45e43c0d741118e470132e (diff) | |
| download | nautilus-2b8ede345aed8e0b3f94fa0b0a1054147b0625c3.tar.gz | |
window-slot: Use view id macros as action values
The slot.files-view-mode action takes hardcoded id values.
This may break if the ids enumeration changes.
To prevent that define the values with a macro which we can stringify.
| -rw-r--r-- | src/nautilus-view.h | 6 | ||||
| -rw-r--r-- | src/nautilus-window-slot.c | 10 |
2 files changed, 12 insertions, 4 deletions
diff --git a/src/nautilus-view.h b/src/nautilus-view.h index deeb4bb3e..9d46ab6dd 100644 --- a/src/nautilus-view.h +++ b/src/nautilus-view.h @@ -24,10 +24,12 @@ #include "nautilus-query.h" #include "nautilus-toolbar-menu-sections.h" +#define NAUTILUS_VIEW_GRID_ID_VALUE 0 +#define NAUTILUS_VIEW_LIST_ID_VALUE 1 enum { - NAUTILUS_VIEW_GRID_ID, - NAUTILUS_VIEW_LIST_ID, + NAUTILUS_VIEW_GRID_ID = NAUTILUS_VIEW_GRID_ID_VALUE, + NAUTILUS_VIEW_LIST_ID = NAUTILUS_VIEW_LIST_ID_VALUE, NAUTILUS_VIEW_EMPTY_ID, NAUTILUS_VIEW_OTHER_LOCATIONS_ID, NAUTILUS_VIEW_INVALID_ID, diff --git a/src/nautilus-window-slot.c b/src/nautilus-window-slot.c index 2113a3d3e..714ccada5 100644 --- a/src/nautilus-window-slot.c +++ b/src/nautilus-window-slot.c @@ -1127,6 +1127,7 @@ static void nautilus_window_slot_init (NautilusWindowSlot *self) { GApplication *app; + app = g_application_get_default (); g_signal_connect (nautilus_trash_monitor_get (), @@ -1149,8 +1150,13 @@ nautilus_window_slot_init (NautilusWindowSlot *self) gtk_widget_insert_action_group (GTK_WIDGET (self), "slot", G_ACTION_GROUP (self->slot_action_group)); - nautilus_application_set_accelerator (app, "slot.files-view-mode(uint32 1)", "<control>1"); - nautilus_application_set_accelerator (app, "slot.files-view-mode(uint32 0)", "<control>2"); + + nautilus_application_set_accelerator (app, + "slot.files-view-mode(uint32 " G_STRINGIFY (NAUTILUS_VIEW_LIST_ID_VALUE) ")", + "<control>1"); + nautilus_application_set_accelerator (app, + "slot.files-view-mode(uint32 " G_STRINGIFY (NAUTILUS_VIEW_GRID_ID_VALUE) ")", + "<control>2"); nautilus_application_set_accelerator (app, "slot.search-visible", "<control>f"); self->view_mode_before_search = NAUTILUS_VIEW_INVALID_ID; |