[nautilus/gnome-3-26] window-slot: inactivate the slot to free in order to unset the action group
- From: Carlos Soriano <csoriano src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus/gnome-3-26] window-slot: inactivate the slot to free in order to unset the action group
- Date: Wed, 18 Jul 2018 15:57:33 +0000 (UTC)
commit 74cf2811ff6d7b8b608b7b751b482b9f008b1fb0
Author: Ernestas Kulik <ernestask gnome org>
Date: Thu Mar 15 22:12:50 2018 +0100
window-slot: inactivate the slot to free in order to unset the action group
This can be done in a single pass as real_inactive will take care of it
src/nautilus-window-slot.c | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
---
diff --git a/src/nautilus-window-slot.c b/src/nautilus-window-slot.c
index 9ba7ed5da..39e9380db 100644
--- a/src/nautilus-window-slot.c
+++ b/src/nautilus-window-slot.c
@@ -2793,6 +2793,8 @@ nautilus_window_slot_dispose (GObject *object)
nautilus_window_slot_remove_extra_location_widgets (self);
+ nautilus_window_slot_set_active (self, FALSE);
+
if (priv->content_view)
{
gtk_widget_destroy (GTK_WIDGET (priv->content_view));
@@ -2817,15 +2819,6 @@ nautilus_window_slot_dispose (GObject *object)
g_clear_pointer (&priv->find_mount_cancellable, g_cancellable_cancel);
- if (priv->window)
- {
- gtk_widget_insert_action_group (GTK_WIDGET (priv->window), "slot", NULL);
- priv->window = NULL;
- }
-
- g_free (priv->title);
- priv->title = NULL;
-
free_location_change (self);
G_OBJECT_CLASS (nautilus_window_slot_parent_class)->dispose (object);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]