From e91afc85898f6530cd5dfb0d75e0296153b1588c Mon Sep 17 00:00:00 2001 From: Darin Adler Date: Thu, 7 Feb 2002 00:24:43 +0000 Subject: eel_signal_connect_while_alive -> g_object_add_weak_pointer. * components/throbber/nautilus-throbber.c: (nautilus_throbber_instance_init): eel_signal_connect_while_alive -> g_object_add_weak_pointer. (nautilus_throbber_finalize), (nautilus_throbber_class_init): Switch to finalize instead of destroy. * components/tree/nautilus-tree-expansion-state.c: Remove. * components/tree/nautilus-tree-expansion-state.h: Remove. * components/tree/nautilus-tree-node-private.h: Remove. * components/tree/nautilus-tree-node.c: Remove. * components/tree/nautilus-tree-node.h: Remove. * components/tree/nautilus-tree-model.h: * components/tree/nautilus-tree-model.c: Rewrite, based on Anders's first cut. * components/tree/nautilus-tree-view.h: Tweaks. * components/tree/nautilus-tree-view.c: (create_tree): Get rid of the header. (nautilus_tree_view_finalize), (nautilus_tree_view_class_init): Added a missing finalize so that we don't leak. * libnautilus-private/nautilus-directory.h: * libnautilus-private/nautilus-directory.c: (nautilus_directory_get_for_file): New. * libnautilus-private/nautilus-file.h: * libnautilus-private/nautilus-file.c: (finalize): Change to finalize from destroy. (nautilus_file_get_parent): Make public, simplify implementation by using nautilus_directory_get_corresponding_file. * src/file-manager/fm-desktop-icon-view.c: (fm_desktop_icon_view_init): * src/nautilus-sidebar.c: (nautilus_sidebar_update_buttons): * src/nautilus-view-frame.c: (nautilus_view_frame_init), (attach_view): * src/nautilus-window-menus.c: (nautilus_window_initialize_bookmarks_menu), (nautilus_window_initialize_go_menu): Use g_signal_connect-object instead of eel_signal_connect_while_alive. --- src/nautilus-information-panel.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'src/nautilus-information-panel.c') diff --git a/src/nautilus-information-panel.c b/src/nautilus-information-panel.c index 61c458c03..f58cf97eb 100644 --- a/src/nautilus-information-panel.c +++ b/src/nautilus-information-panel.c @@ -39,7 +39,6 @@ #include #include -#include #include #include #include @@ -1516,14 +1515,10 @@ nautilus_sidebar_update_buttons (NautilusSidebar *sidebar) sidebar->details->has_buttons = TRUE; g_signal_connect (temp_button, "clicked", - G_CALLBACK (empty_trash_callback), NULL); + G_CALLBACK (empty_trash_callback), NULL); - eel_signal_connect_while_alive (G_OBJECT (nautilus_trash_monitor_get ()), - "trash_state_changed", - G_CALLBACK (nautilus_sidebar_trash_state_changed_callback), - temp_button, - G_OBJECT (temp_button)); - + g_signal_connect_object (nautilus_trash_monitor_get (), "trash_state_changed", + G_CALLBACK (nautilus_sidebar_trash_state_changed_callback), temp_button, 0); } /* Make buttons for each item in short list + "Open with..." catchall, -- cgit v1.2.1