From cc9374e87d86d1e4918391af3e4f6b62266975c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ant=C3=B3nio=20Fernandes?= Date: Sat, 4 May 2024 18:20:57 +0100 Subject: [PATCH] files-view: Don't assume NautilusWindow ancestor We don't need to, for a matter of fact. `gtk_widget_get_root()` is just as effective and is going to make it easier to reuse in the upcoming FileChoser window. Part of: https://gitlab.gnome.org/GNOME/nautilus/-/work_items/3402 --- src/nautilus-batch-rename-dialog.c | 4 +-- src/nautilus-batch-rename-dialog.h | 2 +- src/nautilus-files-view.c | 40 +++++++++++------------------- 3 files changed, 17 insertions(+), 29 deletions(-) diff --git a/src/nautilus-batch-rename-dialog.c b/src/nautilus-batch-rename-dialog.c index b3bc6c9cf..43b23c2f6 100644 --- a/src/nautilus-batch-rename-dialog.c +++ b/src/nautilus-batch-rename-dialog.c @@ -36,7 +36,7 @@ struct _NautilusBatchRenameDialog GtkDialog parent; GtkWidget *grid; - NautilusWindow *window; + GtkRoot *window; GtkWidget *cancel_button; GtkWidget *original_name_listbox; @@ -1824,7 +1824,7 @@ nautilus_batch_rename_dialog_class_init (NautilusBatchRenameDialogClass *klass) GtkWidget * nautilus_batch_rename_dialog_new (GList *selection, NautilusDirectory *directory, - NautilusWindow *window) + GtkRoot *window) { NautilusBatchRenameDialog *dialog; GString *dialog_title; diff --git a/src/nautilus-batch-rename-dialog.h b/src/nautilus-batch-rename-dialog.h index 2c93910d9..911cdffc8 100644 --- a/src/nautilus-batch-rename-dialog.h +++ b/src/nautilus-batch-rename-dialog.h @@ -223,7 +223,7 @@ G_DECLARE_FINAL_TYPE (NautilusBatchRenameDialog, nautilus_batch_rename_dialog, N GtkWidget* nautilus_batch_rename_dialog_new (GList *selection, NautilusDirectory *directory, - NautilusWindow *window); + GtkRoot *window); void nautilus_batch_rename_dialog_query_finished (NautilusBatchRenameDialog *dialog, GHashTable *hash_table, diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c index 7717fdd5c..b83849598 100644 --- a/src/nautilus-files-view.c +++ b/src/nautilus-files-view.c @@ -1227,16 +1227,6 @@ create_templates_parameters_free (CreateTemplateParameters *parameters) g_free (parameters); } -static NautilusWindow * -nautilus_files_view_get_window (NautilusFilesView *view) -{ - NautilusFilesViewPrivate *priv; - - priv = nautilus_files_view_get_instance_private (view); - - return nautilus_window_slot_get_window (priv->slot); -} - /* Returns the GtkWindow that this directory view occupies, or NULL * if at the moment this directory view is not in a GtkWindow or the * GtkWindow cannot be determined. Primarily used for parenting dialogs. @@ -1834,12 +1824,10 @@ select_pattern (NautilusFilesView *view) { g_autoptr (GtkBuilder) builder = NULL; GtkWidget *dialog; - NautilusWindow *window; GtkWidget *example; GtkWidget *entry, *select_button; char *example_pattern; - window = nautilus_files_view_get_window (view); builder = gtk_builder_new_from_resource ("/org/gnome/nautilus/ui/nautilus-files-view-select-items.ui"); dialog = GTK_WIDGET (gtk_builder_get_object (builder, "select_items_dialog")); @@ -1849,7 +1837,8 @@ select_pattern (NautilusFilesView *view) "*.png, file\?\?.txt, pict*.\?\?\?"); gtk_label_set_markup (GTK_LABEL (example), example_pattern); g_free (example_pattern); - gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (window)); + gtk_window_set_transient_for (GTK_WINDOW (dialog), + GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (view)))); entry = GTK_WIDGET (gtk_builder_get_object (builder, "pattern_entry")); select_button = GTK_WIDGET (gtk_builder_get_object (builder, "select_button")); @@ -3163,14 +3152,14 @@ slot_active_changed (NautilusWindowSlot *slot, schedule_update_context_menus (view); - gtk_widget_insert_action_group (GTK_WIDGET (nautilus_files_view_get_window (view)), + gtk_widget_insert_action_group (GTK_WIDGET (gtk_widget_get_root (GTK_WIDGET (view))), "view", G_ACTION_GROUP (priv->view_action_group)); } else { remove_update_context_menus_timeout_callback (view); - gtk_widget_insert_action_group (GTK_WIDGET (nautilus_files_view_get_window (view)), + gtk_widget_insert_action_group (GTK_WIDGET (gtk_widget_get_root (GTK_WIDGET (view))), "view", NULL); } @@ -6078,7 +6067,7 @@ copy_or_move_selection (NautilusFilesView *view, gtk_file_dialog_set_initial_folder (dialog, location); gtk_file_dialog_select_folder (dialog, - GTK_WINDOW (nautilus_files_view_get_window (view)), + GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (view))), NULL, (GAsyncReadyCallback) on_destination_dialog_response, copy_data); @@ -6230,9 +6219,8 @@ real_action_rename (NautilusFilesView *view) /* If there is more than one file selected, invoke a batch renamer */ if (selection->next != NULL) { - NautilusWindow *window; + GtkRoot *window = gtk_widget_get_root (GTK_WIDGET (view)); - window = nautilus_files_view_get_window (view); gtk_widget_set_cursor_from_name (GTK_WIDGET (window), "progress"); dialog = nautilus_batch_rename_dialog_new (selection, @@ -6465,7 +6453,7 @@ extract_files_to_chosen_location (NautilusFilesView *view, data->files = nautilus_file_list_copy (files); gtk_file_dialog_select_folder (dialog, - GTK_WINDOW (nautilus_files_view_get_window (view)), + GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (view))), NULL, (GAsyncReadyCallback) on_extract_destination_dialog_response, data); @@ -6809,7 +6797,7 @@ file_mount_callback (NautilusFile *file, nautilus_file_get_display_name (file)); show_dialog (text, error->message, - GTK_WINDOW (nautilus_files_view_get_window (self)), + GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (self))), GTK_MESSAGE_ERROR); } } @@ -6836,7 +6824,7 @@ file_unmount_callback (NautilusFile *file, nautilus_file_get_display_name (file)); show_dialog (text, error->message, - GTK_WINDOW (nautilus_files_view_get_window (self)), + GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (self))), GTK_MESSAGE_ERROR); } } @@ -6859,7 +6847,7 @@ file_eject_callback (NautilusFile *file, nautilus_file_get_display_name (file)); show_dialog (text, error->message, - GTK_WINDOW (nautilus_files_view_get_window (self)), + GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (self))), GTK_MESSAGE_ERROR); } } @@ -6879,7 +6867,7 @@ file_stop_callback (NautilusFile *file, { show_dialog (_("Unable to stop drive"), error->message, - GTK_WINDOW (nautilus_files_view_get_window (self)), + GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (self))), GTK_MESSAGE_ERROR); } } @@ -6995,7 +6983,7 @@ file_start_callback (NautilusFile *file, g_autofree char *text = g_strdup_printf (_("Unable to start “%s”"), name); show_dialog (text, error->message, - GTK_WINDOW (nautilus_files_view_get_window (view)), + GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (view))), GTK_MESSAGE_ERROR); } } @@ -9332,7 +9320,7 @@ on_parent_changed (GObject *object, if (nautilus_window_slot_get_active (priv->slot)) { priv->active = TRUE; - gtk_widget_insert_action_group (GTK_WIDGET (nautilus_files_view_get_window (view)), + gtk_widget_insert_action_group (GTK_WIDGET (gtk_widget_get_root (widget)), "view", G_ACTION_GROUP (priv->view_action_group)); } @@ -9346,7 +9334,7 @@ on_parent_changed (GObject *object, */ if (priv->active) { - gtk_widget_insert_action_group (GTK_WIDGET (nautilus_files_view_get_window (view)), + gtk_widget_insert_action_group (GTK_WIDGET (gtk_widget_get_root (GTK_WIDGET (priv->slot))), "view", NULL); }