gnome/nautilus
gnome/nautilus
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/nautilus synced 2024-06-30 23:46:35 +00:00
Code Issues Projects Releases Wiki Activity

window-slot: Drop :window property

Browse Source 
We need NautilusWindowSlot to be reusable in the FileChooser window.

This means it cannot assume its parent is a NautilusWindow.

For NautilusWindowSlot code, rely on gtk_widget_get_root().
For NautilusApplication we can assume a NautilusWindow ancestor.

Part of: https://gitlab.gnome.org/GNOME/nautilus/-/work_items/3402
This commit is contained in:
António Fernandes 2024-05-05 00:25:15 +01:00
parent 00019651b6
commit 33aedd51fd
4 changed files with 28 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/nautilus-application.c
View File

@ -316,6 +316,13 @@ get_window_slot_for_location (NautilusApplication *self,
return NULL;
}
static NautilusWindow *
get_nautilus_window_containing_slot (NautilusWindowSlot *slot)
{
return NAUTILUS_WINDOW (gtk_widget_get_ancestor (GTK_WIDGET (slot),
NAUTILUS_TYPE_WINDOW));
}
void
nautilus_application_open_location_full (NautilusApplication *self,
GFile *location,
@ -390,7 +397,7 @@ real_open_location_full (NautilusApplication *self,
* slot we target at */
if (target_slot != NULL)
{
target_window = nautilus_window_slot_get_window (target_slot);
target_window = get_nautilus_window_containing_slot (target_slot);
}
g_assert (!((flags & NAUTILUS_OPEN_FLAG_NEW_WINDOW) != 0 &&
@ -413,7 +420,7 @@ real_open_location_full (NautilusApplication *self,
}
else
{
target_window = nautilus_window_slot_get_window (target_slot);
target_window = get_nautilus_window_containing_slot (target_slot);
}
}
}
@ -482,7 +489,7 @@ nautilus_application_open_location (NautilusApplication *self,
}
else
{
window = nautilus_window_slot_get_window (slot);
window = get_nautilus_window_containing_slot (slot);
}
nautilus_application_open_location_full (self, location, 0, sel_list, window, slot);

75
src/nautilus-window-slot.c
View File

@ -51,7 +51,6 @@
enum
{
PROP_ACTIVE = 1,
PROP_WINDOW,
PROP_ICON_NAME,
PROP_TOOLBAR_MENU_SECTIONS,
PROP_EXTENSIONS_BACKGROUND_MENU,
@ -71,8 +70,6 @@ struct _NautilusWindowSlot
{
AdwBin parent_instance;
NautilusWindow *window;
gboolean active : 1;
guint loading : 1;
@ -436,7 +433,7 @@ hide_query_editor (NautilusWindowSlot *self)
if (nautilus_window_slot_get_active (self))
{
gtk_widget_grab_focus (GTK_WIDGET (self->window));
gtk_widget_grab_focus (GTK_WIDGET (gtk_widget_get_root (GTK_WIDGET (self))));
}
}
@ -656,12 +653,6 @@ nautilus_window_slot_set_property (GObject *object,
switch (property_id)
{
case PROP_WINDOW:
{
nautilus_window_slot_set_window (self, g_value_get_object (value));
}
break;
case PROP_LOCATION:
{
nautilus_window_slot_set_location (self, g_value_get_object (value));
@ -747,12 +738,6 @@ nautilus_window_slot_get_property (GObject *object,
}
break;
case PROP_WINDOW:
{
g_value_set_object (value, self->window);
}
break;
case PROP_ICON_NAME:
{
g_value_set_static_string (value, nautilus_window_slot_get_icon_name (self));
@ -1599,10 +1584,10 @@ mount_not_mounted_callback (GObject *source_object,
}
static void
nautilus_window_slot_display_view_selection_failure (NautilusWindow *window,
NautilusFile *file,
GFile *location,
GError *error)
nautilus_window_slot_display_view_selection_failure (GtkWindow *window,
NautilusFile *file,
GFile *location,
GError *error)
{
char *error_message;
char *detail_message;
@ -1710,7 +1695,7 @@ nautilus_window_slot_display_view_selection_failure (NautilusWindow *window,
detail_message = g_strdup_printf (_("Unhandled error message: %s"), error->message);
}
show_dialog (error_message, detail_message, GTK_WINDOW (window), GTK_MESSAGE_ERROR);
show_dialog (error_message, detail_message, window, GTK_MESSAGE_ERROR);
done:
g_free (error_message);
@ -1738,14 +1723,12 @@ static gboolean
handle_mount_if_needed (NautilusWindowSlot *self,
NautilusFile *file)
{
NautilusWindow *window;
GMountOperation *mount_op;
MountNotMountedData *data;
GFile *location;
GError *error = NULL;
gboolean needs_mount_handling = FALSE;
window = nautilus_window_slot_get_window (self);
if (self->mount_error)
{
error = g_error_copy (self->mount_error);
@ -1760,7 +1743,7 @@ handle_mount_if_needed (NautilusWindowSlot *self,
{
self->tried_mount = TRUE;
mount_op = gtk_mount_operation_new (GTK_WINDOW (window));
mount_op = gtk_mount_operation_new (GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (self))));
g_mount_operation_set_password_save (mount_op, G_PASSWORD_SAVE_FOR_SESSION);
location = nautilus_file_get_location (file);
data = g_new0 (MountNotMountedData, 1);
@ -1823,13 +1806,11 @@ got_file_info_for_view_selection_callback (NautilusFile *file,
gpointer callback_data)
{
GError *error = NULL;
NautilusWindow *window;
NautilusWindowSlot *self;
NautilusView *view;
GFile *location;
self = callback_data;
window = nautilus_window_slot_get_window (self);
g_assert (self->determine_view_file == file);
self->determine_view_file = NULL;
@ -1864,6 +1845,8 @@ got_file_info_for_view_selection_callback (NautilusFile *file,
}
else
{
GtkWindow *window = GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (self)));
nautilus_window_slot_display_view_selection_failure (window,
file,
location,
@ -2862,13 +2845,6 @@ nautilus_window_slot_class_init (NautilusWindowSlotClass *klass)
"The selection of the current view of the slot. Proxy property from the view",
G_PARAM_READWRITE);
properties[PROP_WINDOW] =
g_param_spec_object ("window",
"The NautilusWindow",
"The NautilusWindow this slot is part of",
NAUTILUS_TYPE_WINDOW,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT);
properties[PROP_ICON_NAME] =
g_param_spec_string ("icon-name",
"Icon that represents the slot",
@ -2957,28 +2933,6 @@ nautilus_window_slot_get_location_uri (NautilusWindowSlot *self)
return NULL;
}
NautilusWindow *
nautilus_window_slot_get_window (NautilusWindowSlot *self)
{
g_assert (NAUTILUS_IS_WINDOW_SLOT (self));
return self->window;
}
void
nautilus_window_slot_set_window (NautilusWindowSlot *self,
NautilusWindow *window)
{
g_assert (NAUTILUS_IS_WINDOW_SLOT (self));
g_assert (NAUTILUS_IS_WINDOW (window));
if (self->window != window)
{
self->window = window;
g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_WINDOW]);
}
}
/* nautilus_window_slot_update_title:
*
* Re-calculate the slot title.
@ -3103,10 +3057,9 @@ nautilus_window_slot_get_forward_history (NautilusWindowSlot *self)
}
NautilusWindowSlot *
nautilus_window_slot_new (NautilusWindow *window)
nautilus_window_slot_new (void)
{
return g_object_new (NAUTILUS_TYPE_WINDOW_SLOT,
"window", window,
NULL);
}
@ -3212,18 +3165,16 @@ void
nautilus_window_slot_set_active (NautilusWindowSlot *self,
gboolean active)
{
NautilusWindow *window;
g_return_if_fail (NAUTILUS_IS_WINDOW_SLOT (self));
if (self->active != active)
{
GtkRoot *window = gtk_widget_get_root (GTK_WIDGET (self));
self->active = active;
if (active)
{
window = self->window;
/* sync window to new slot */
nautilus_window_slot_sync_actions (self);
@ -3231,8 +3182,6 @@ nautilus_window_slot_set_active (NautilusWindowSlot *self,
}
else
{
window = nautilus_window_slot_get_window (self);
gtk_widget_insert_action_group (GTK_WIDGET (window), "slot", NULL);
}

6
src/nautilus-window-slot.h
View File

@ -46,11 +46,7 @@ typedef struct
NautilusQuery *current_search_query;
} NautilusNavigationState;
NautilusWindowSlot * nautilus_window_slot_new (NautilusWindow *window);
NautilusWindow * nautilus_window_slot_get_window (NautilusWindowSlot *slot);
void nautilus_window_slot_set_window (NautilusWindowSlot *slot,
NautilusWindow *window);
NautilusWindowSlot * nautilus_window_slot_new (void);
void nautilus_window_slot_open_location_full (NautilusWindowSlot *slot,
GFile *location,

12
src/nautilus-window.c
View File

@ -574,8 +574,7 @@ tab_view_notify_selected_page_cb (AdwTabView *tab_view,
slot = NAUTILUS_WINDOW_SLOT (widget);
g_assert (slot != NULL);
nautilus_window_set_active_slot (nautilus_window_slot_get_window (slot),
slot);
nautilus_window_set_active_slot (window, slot);
}
static void
@ -603,7 +602,7 @@ nautilus_window_create_and_init_slot (NautilusWindow *window,
{
NautilusWindowSlot *slot;
slot = nautilus_window_slot_new (window);
slot = nautilus_window_slot_new ();
nautilus_window_initialize_slot (window, slot, flags);
return slot;
@ -1484,7 +1483,6 @@ tab_view_page_attached_cb (AdwTabView *tab_view,
{
NautilusWindowSlot *slot = NAUTILUS_WINDOW_SLOT (adw_tab_page_get_child (page));
nautilus_window_slot_set_window (slot, window);
window->slots = g_list_append (window->slots, slot);
g_signal_emit (window, signals[SLOT_ADDED], 0, slot);
}
@ -1893,9 +1891,9 @@ nautilus_window_set_active_slot (NautilusWindow *window,
g_assert (NAUTILUS_IS_WINDOW (window));
if (new_slot)
if (new_slot != NULL)
{
g_assert ((window == nautilus_window_slot_get_window (new_slot)));
g_assert (gtk_widget_is_ancestor (GTK_WIDGET (new_slot), GTK_WIDGET (window)));
}
old_slot = nautilus_window_get_active_slot (window);
@ -2062,7 +2060,7 @@ nautilus_window_back_or_forward_in_new_tab (NautilusWindow *window,
NautilusNavigationState *state;
window_slot = nautilus_window_get_active_slot (window);
new_slot = nautilus_window_slot_new (window);
new_slot = nautilus_window_slot_new ();
state = nautilus_window_slot_get_navigation_state (window_slot);
/* Manually fix up the back / forward lists and location.