summaryrefslogtreecommitdiff
path: root/src/nautilus-view-frame.c
diff options
context:
space:
mode:
authorDarin Adler <darin@src.gnome.org>2001-04-25 01:08:30 +0000
committerDarin Adler <darin@src.gnome.org>2001-04-25 01:08:30 +0000
commit6fd84963acbb24b4a12557615d190f586eb2e362 (patch)
tree447198d5df829ed94b89c5df9bacca01837d0338 /src/nautilus-view-frame.c
parent103bb10562d08af4c8fe6d27c1bbe0f9f8cf3056 (diff)
downloadnautilus-6fd84963acbb24b4a12557615d190f586eb2e362.tar.gz
Fix bug 8152 (Opening Help sidebar crashes Nautilus):
* src/nautilus-sidebar.c: (notify_current_sidebar_view): Add check for NIL control. * nautilus-clean.sh: Change egrep args so we get fewer false positives. * src/nautilus-view-frame.c: (nautilus_view_frame_get_control): Formatting tweaks.
Diffstat (limited to 'src/nautilus-view-frame.c')
-rw-r--r--src/nautilus-view-frame.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/nautilus-view-frame.c b/src/nautilus-view-frame.c
index 8bb02e99a..df7d13fac 100644
--- a/src/nautilus-view-frame.c
+++ b/src/nautilus-view-frame.c
@@ -1285,9 +1285,8 @@ Bonobo_Control
nautilus_view_frame_get_control (NautilusViewFrame *view)
{
if (view->details->control_frame == NULL) {
- return NULL;
+ return CORBA_OBJECT_NIL;
}
-
return bonobo_control_frame_get_control (view->details->control_frame);
}