diff options
| author | Christian Neumair <cneumair@gnome.org> | 2008-03-22 18:29:13 +0000 |
|---|---|---|
| committer | Christian Neumair <cneumair@src.gnome.org> | 2008-03-22 18:29:13 +0000 |
| commit | ab0ba61800cb60e38272362f807db987b814a8d7 (patch) | |
| tree | 4f0c52819e9cf03c89455e6fb82001e96cd04738 /src/nautilus-navigation-window.c | |
| parent | a623c0892928af7c15df20e1db8efde5f0561e06 (diff) | |
| download | nautilus-ab0ba61800cb60e38272362f807db987b814a8d7.tar.gz | |
Do not try to hide zoom control if we are already destroyed.
2008-03-22 Christian Neumair <cneumair@gnome.org>
* src/nautilus-navigation-window.c: (real_disconnect_content_view):
Do not try to hide zoom control if we are already destroyed.
* src/nautilus-spatial-window.c (real_close_slot):
Do not assert that the slot is currently active.
* src/nautilus-window.c (nautilus_window_destroy),
(nautilus_window_close):
Move slot close code from close() to destroy().
svn path=/branches/multiview/; revision=13969
Diffstat (limited to 'src/nautilus-navigation-window.c')
| -rw-r--r-- | src/nautilus-navigation-window.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c index bb6fb8406..bb0d5b4d8 100644 --- a/src/nautilus-navigation-window.c +++ b/src/nautilus-navigation-window.c @@ -1042,7 +1042,12 @@ real_disconnect_content_view (NautilusWindow *nautilus_window, G_CALLBACK (zoom_level_changed_callback), window); - gtk_widget_hide (window->zoom_control); + if (window->zoom_control != NULL) { + /* if we run in destroy(), the + * zoom control is already gone + */ + gtk_widget_hide (window->zoom_control); + } } static void |