diff options
-rw-r--r-- | ChangeLog | 11 | ||||
-rw-r--r-- | src/nautilus-navigation-window-slot.c | 10 | ||||
-rw-r--r-- | src/nautilus-window-slot.c | 15 |
3 files changed, 28 insertions, 8 deletions
@@ -1,3 +1,14 @@ +2008-05-01 Christian Neumair <cneumair@gnome.org> + + * src/nautilus-navigation-window-slot.c + (nautilus_navigation_window_slot_active), + (nautilus_navigation_window_slot_dispose), + (nautilus_navigation_window_slot_class_init): + * src/nautilus-window-slot.c (nautilus_window_slot_init), + (nautilus_window_slot_class_init), (nautilus_window_slot_dispose): + Use dispose instead of finalize. Only load toolbar items on slot + activation if we have a viewed file. Set default title to "Loading...". + 2008-03-22 Christian Neumair <cneumair@gnome.org> * src/nautilus-window-manage-views.c diff --git a/src/nautilus-navigation-window-slot.c b/src/nautilus-navigation-window-slot.c index b5310075a..17b298893 100644 --- a/src/nautilus-navigation-window-slot.c +++ b/src/nautilus-navigation-window-slot.c @@ -70,7 +70,9 @@ nautilus_navigation_window_slot_active (NautilusWindowSlot *slot) EEL_CALL_PARENT (NAUTILUS_WINDOW_SLOT_CLASS, active, (slot)); - nautilus_navigation_window_load_extension_toolbar_items (window); + if (slot->viewed_file != NULL) { + nautilus_navigation_window_load_extension_toolbar_items (window); + } } static NautilusWindowSlot * @@ -112,7 +114,7 @@ nautilus_navigation_window_slot_get_close_successor (NautilusWindowSlot *slot) } static void -nautilus_navigation_window_slot_finalize (GObject *object) +nautilus_navigation_window_slot_dispose (GObject *object) { NautilusNavigationWindowSlot *slot; @@ -121,7 +123,7 @@ nautilus_navigation_window_slot_finalize (GObject *object) nautilus_navigation_window_slot_clear_forward_list (slot); nautilus_navigation_window_slot_clear_back_list (slot); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (parent_class)->dispose (object); } static void @@ -135,5 +137,5 @@ nautilus_navigation_window_slot_class_init (NautilusNavigationWindowSlotClass *c NAUTILUS_WINDOW_SLOT_CLASS (class)->active = nautilus_navigation_window_slot_active; NAUTILUS_WINDOW_SLOT_CLASS (class)->get_close_successor = nautilus_navigation_window_slot_get_close_successor; - G_OBJECT_CLASS (class)->finalize = nautilus_navigation_window_slot_finalize; + G_OBJECT_CLASS (class)->dispose = nautilus_navigation_window_slot_dispose; } diff --git a/src/nautilus-window-slot.c b/src/nautilus-window-slot.c index 5175d14b5..1dd197f54 100644 --- a/src/nautilus-window-slot.c +++ b/src/nautilus-window-slot.c @@ -34,7 +34,7 @@ static void nautilus_window_slot_init (NautilusWindowSlot *slot); static void nautilus_window_slot_class_init (NautilusWindowSlotClass *class); -static void nautilus_window_slot_finalize (GObject *object); +static void nautilus_window_slot_dispose (GObject *object); static void nautilus_window_slot_info_iface_init (NautilusWindowSlotInfoIface *iface); @@ -128,6 +128,8 @@ nautilus_window_slot_init (NautilusWindowSlot *slot) slot->view_box = gtk_vbox_new (FALSE, 0); gtk_box_pack_start (GTK_BOX (content_box), slot->view_box, TRUE, TRUE, 0); gtk_widget_show (slot->view_box); + + slot->title = g_strdup (_("Loading...")); } static NautilusWindowSlot * @@ -143,7 +145,7 @@ nautilus_window_slot_class_init (NautilusWindowSlotClass *class) class->inactive = real_inactive; class->get_close_successor = real_get_close_successor; - G_OBJECT_CLASS (class)->finalize = nautilus_window_slot_finalize; + G_OBJECT_CLASS (class)->dispose = nautilus_window_slot_dispose; } static int @@ -346,7 +348,7 @@ nautilus_window_slot_get_close_successor (NautilusWindowSlot *slot) static void -nautilus_window_slot_finalize (GObject *object) +nautilus_window_slot_dispose (GObject *object) { NautilusWindowSlot *slot; GtkWidget *widget; @@ -363,13 +365,17 @@ nautilus_window_slot_finalize (GObject *object) * It was already here before the slot move, though */ g_object_ref (slot->location); } + eel_g_list_free_deep (slot->pending_selection); + slot->pending_selection = NULL; if (slot->current_location_bookmark != NULL) { g_object_unref (slot->current_location_bookmark); + slot->current_location_bookmark = NULL; } if (slot->last_location_bookmark != NULL) { g_object_unref (slot->last_location_bookmark); + slot->last_location_bookmark = NULL; } if (slot->find_mount_cancellable != NULL) { @@ -392,8 +398,9 @@ nautilus_window_slot_finalize (GObject *object) } g_free (slot->title); + slot->title = NULL; - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (parent_class)->dispose (object); } static void |