diff options
| author | Carlos Soriano <csoriano@gnome.org> | 2016-01-13 18:51:11 +0100 |
|---|---|---|
| committer | Carlos Soriano <csoriano@gnome.org> | 2016-01-14 17:00:11 +0100 |
| commit | b5d441be32f58357f30e48607975a20959300ca5 (patch) | |
| tree | 78e11bbaff3149c0d3436e01fb3dac63ffcdbb22 | |
| parent | d86bef7867f188232ae98a712c0c47760b9ebad3 (diff) | |
| download | nautilus-b5d441be32f58357f30e48607975a20959300ca5.tar.gz | |
files-view: move disconnect_signal calls to destroy
So we have all the disconnection in one place and we avoid
random callbacks while destroying.
| -rw-r--r-- | src/nautilus-files-view.c | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c index b2a6de1e8..885858aef 100644 --- a/src/nautilus-files-view.c +++ b/src/nautilus-files-view.c @@ -2895,6 +2895,18 @@ nautilus_files_view_destroy (GtkWidget *object) view->details->floating_bar_loading_timeout_id = 0; } + g_signal_handlers_disconnect_by_func (nautilus_preferences, + schedule_update_context_menus, view); + g_signal_handlers_disconnect_by_func (nautilus_preferences, + click_policy_changed_callback, view); + g_signal_handlers_disconnect_by_func (nautilus_preferences, + sort_directories_first_changed_callback, view); + g_signal_handlers_disconnect_by_func (gtk_filechooser_preferences, + show_hidden_files_changed_callback, view); + g_signal_handlers_disconnect_by_func (nautilus_window_state, + nautilus_files_view_display_selection_info, view); + g_signal_handlers_disconnect_by_func (gnome_lockdown_preferences, + schedule_update_context_menus, view); nautilus_file_unref (view->details->directory_as_file); view->details->directory_as_file = NULL; @@ -2915,19 +2927,6 @@ nautilus_files_view_finalize (GObject *object) view = NAUTILUS_FILES_VIEW (object); - g_signal_handlers_disconnect_by_func (nautilus_preferences, - schedule_update_context_menus, view); - g_signal_handlers_disconnect_by_func (nautilus_preferences, - click_policy_changed_callback, view); - g_signal_handlers_disconnect_by_func (nautilus_preferences, - sort_directories_first_changed_callback, view); - g_signal_handlers_disconnect_by_func (gtk_filechooser_preferences, - show_hidden_files_changed_callback, view); - g_signal_handlers_disconnect_by_func (nautilus_window_state, - nautilus_files_view_display_selection_info, view); - - g_signal_handlers_disconnect_by_func (gnome_lockdown_preferences, - schedule_update_context_menus, view); g_clear_object (&view->details->view_action_group); g_clear_object (&view->details->background_menu); g_clear_object (&view->details->selection_menu); |