summaryrefslogtreecommitdiff
path: root/src/nautilus-object-window.c
diff options
context:
space:
mode:
authorJohn Sullivan <sullivan@src.gnome.org>2000-07-31 18:12:35 +0000
committerJohn Sullivan <sullivan@src.gnome.org>2000-07-31 18:12:35 +0000
commit54effa8195fba54fbe24885c91a6e06c00ccbad7 (patch)
tree10db591a5798e0ce86bbbbb7c210ed9e07240ad6 /src/nautilus-object-window.c
parenta218e5572fda4235f0c60b8195af28c934678c1c (diff)
downloadnautilus-54effa8195fba54fbe24885c91a6e06c00ccbad7.tar.gz
Finished rest of bug 762 (Framework for dealing with
component that crashes). Remaining component-failure issues have been split off as separate bugs. * src/nautilus-sidebar.c: (nautilus_sidebar_remove_panel), * src/nautilus-view-frame.c: (check_object): Just added FIXME comments with bug numbers. * src/nautilus-window-manage-views.c: (report_sidebar_panel_failure_to_user): Turned this from a placeholder to a real function that puts up a sensible error message. (nautilus_window_update_state): Moved the report_to_user call to a place where it is hit in all the error cases, not just some. * src/nautilus-window.c: (window_update_sidebar_panels_from_preferences): Call nautilus_window_disconnect_view on sidebar panel before removing it the normal way so that it doesn't trigger the report-error-to-user code.
Diffstat (limited to 'src/nautilus-object-window.c')
-rw-r--r--src/nautilus-object-window.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/nautilus-object-window.c b/src/nautilus-object-window.c
index 0e150065b..f013b371a 100644
--- a/src/nautilus-object-window.c
+++ b/src/nautilus-object-window.c
@@ -1383,6 +1383,7 @@ window_update_sidebar_panels_from_preferences (NautilusWindow *window)
sidebar_panel = window_find_sidebar_panel_by_identifier (window, identifier);
if (sidebar_panel != NULL) {
+ nautilus_window_disconnect_view (window, sidebar_panel);
nautilus_window_remove_sidebar_panel (window, sidebar_panel);
gtk_widget_unref (GTK_WIDGET (sidebar_panel));