From 46afb4a9a475898c2a662b8a79e078fbf9bd1b8b Mon Sep 17 00:00:00 2001 From: Luca Bacci Date: Sat, 17 Jun 2023 14:40:19 +0200 Subject: [PATCH 1/2] GtkFileChooserWidget: Fix condition on visit action Fixes #5899 --- gtk/gtkfilechooserwidget.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c index ad3d79ad945..a57be7c0e55 100644 --- a/gtk/gtkfilechooserwidget.c +++ b/gtk/gtkfilechooserwidget.c @@ -1862,6 +1862,7 @@ file_list_update_popover (GtkFileChooserWidget *impl) { GAction *action; gboolean state; + gboolean visit; file_list_build_popover (impl); check_file_list_popover_sensitivity (impl); @@ -1873,6 +1874,9 @@ file_list_update_popover (GtkFileChooserWidget *impl) impl->operation_mode == OPERATION_MODE_BROWSE && impl->browse_files_popover_item != G_MAXUINT; + visit = impl->operation_mode != OPERATION_MODE_BROWSE && + impl->browse_files_popover_item != G_MAXUINT; + action = g_action_map_lookup_action (G_ACTION_MAP (impl->item_actions), "rename"); g_simple_action_set_enabled (G_SIMPLE_ACTION (action), state); @@ -1883,7 +1887,7 @@ file_list_update_popover (GtkFileChooserWidget *impl) g_simple_action_set_enabled (G_SIMPLE_ACTION (action), state); action = g_action_map_lookup_action (G_ACTION_MAP (impl->item_actions), "visit"); - g_simple_action_set_enabled (G_SIMPLE_ACTION (action), (impl->operation_mode != OPERATION_MODE_BROWSE)); + g_simple_action_set_enabled (G_SIMPLE_ACTION (action), visit); action = g_action_map_lookup_action (G_ACTION_MAP (impl->item_actions), "toggle-show-hidden"); g_simple_action_set_state (G_SIMPLE_ACTION (action), g_variant_new_boolean (impl->show_hidden)); -- GitLab From 16bdaa11cea9a14f07b1d042384536511d4d1c2b Mon Sep 17 00:00:00 2001 From: Luca Bacci Date: Sat, 17 Jun 2023 15:45:07 +0200 Subject: [PATCH 2/2] GtkFileChooserWidget: Use GTK_INVALID_LIST_POSITION ...instead of G_MAXUINT --- gtk/gtkfilechooserwidget.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c index a57be7c0e55..592df92c024 100644 --- a/gtk/gtkfilechooserwidget.c +++ b/gtk/gtkfilechooserwidget.c @@ -1872,10 +1872,10 @@ file_list_update_popover (GtkFileChooserWidget *impl) */ state = impl->action == GTK_FILE_CHOOSER_ACTION_SAVE && impl->operation_mode == OPERATION_MODE_BROWSE && - impl->browse_files_popover_item != G_MAXUINT; + impl->browse_files_popover_item != GTK_INVALID_LIST_POSITION; visit = impl->operation_mode != OPERATION_MODE_BROWSE && - impl->browse_files_popover_item != G_MAXUINT; + impl->browse_files_popover_item != GTK_INVALID_LIST_POSITION; action = g_action_map_lookup_action (G_ACTION_MAP (impl->item_actions), "rename"); g_simple_action_set_enabled (G_SIMPLE_ACTION (action), state); @@ -7238,7 +7238,7 @@ popup_menu (GtkWidget *widget, double y) { gtk_widget_activate_action (widget, "item.popup-file-list-menu", - "(udd)", G_MAXUINT, x, y); + "(udd)", GTK_INVALID_LIST_POSITION, x, y); } static void -- GitLab