Fixed crashes introduced in the course of my reorganization - in one case

        * libnautilus/ntl-view-frame.c: Fixed crashes introduced in the
	course of my reorganization - in one case I g_new()'d something
	that should have been g_new0()'d, in another I forgot to
	CORBA_exception_init().

4 files changed, 31 insertions, 12 deletions

diff --git a/ChangeLog-20000414 b/ChangeLog-20000414
index fedfbc852..ffb1da548 100644
--- a/ChangeLog-20000414
+++ b/ChangeLog-20000414
@@ -1,3 +1,10 @@
+2000-02-21  Maciej Stachowiak  <mjs@eazel.com>
+
+	* libnautilus/ntl-view-frame.c: Fixed crashes introduced in the
+	course of my reorganization - in one case I g_new()'d something
+	that should have been g_new0()'d, in another I forgot to
+	CORBA_exception_init().
+	
 2000-02-21  Andy Hertzfeld <andy@eazel.com>
 
     added document icons to eazel icons theme in 4 sizes
diff --git a/libnautilus/nautilus-view-frame.c b/libnautilus/nautilus-view-frame.c
index 8aa52104b..ff7c1f74a 100644
--- a/libnautilus/nautilus-view-frame.c
+++ b/libnautilus/nautilus-view-frame.c
@@ -340,7 +340,7 @@ nautilus_view_frame_init (NautilusViewFrame *view)
   CORBA_Environment ev;
   CORBA_exception_init(&ev);
 
-  view->private = g_new (NautilusViewFramePrivate, 1);
+  view->private = g_new0 (NautilusViewFramePrivate, 1);
 
   bonobo_object_construct (BONOBO_OBJECT (view), impl_Nautilus_View__create (view, &ev));
 
@@ -392,14 +392,16 @@ nautilus_view_frame_ensure_view_frame (NautilusViewFrame *view)
 
   CORBA_exception_init (&ev);
 
-  if (CORBA_Object_is_nil (view->private->view_frame, &ev))
+  if (CORBA_Object_is_nil (view->private->view_frame, &ev)) {
     view->private->view_frame = Bonobo_Unknown_query_interface 
       (bonobo_control_get_control_frame 
        (BONOBO_CONTROL (nautilus_view_frame_get_bonobo_control (view))),
        "IDL:Nautilus/ViewFrame:1.0", &ev);
+    if (ev._major != CORBA_NO_EXCEPTION) {
+      view->private->view_frame = CORBA_OBJECT_NIL;
+    }
+  }
 
-  if (ev._major != CORBA_NO_EXCEPTION)
-    view->private->view_frame = CORBA_OBJECT_NIL;
 
   if (CORBA_Object_is_nil (view->private->view_frame, &ev)) {
     CORBA_exception_free (&ev);
@@ -419,6 +421,8 @@ nautilus_view_frame_request_location_change (NautilusViewFrame *view,
   g_return_if_fail (view != NULL);
   g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view));
 
+  CORBA_exception_init (&ev);
+
   if (nautilus_view_frame_ensure_view_frame (view)) {
     Nautilus_ViewFrame_request_location_change(view->private->view_frame, loc, &ev);
     if(ev._major != CORBA_NO_EXCEPTION)
diff --git a/libnautilus/nautilus-view.c b/libnautilus/nautilus-view.c
index 8aa52104b..ff7c1f74a 100644
--- a/libnautilus/nautilus-view.c
+++ b/libnautilus/nautilus-view.c
@@ -340,7 +340,7 @@ nautilus_view_frame_init (NautilusViewFrame *view)
   CORBA_Environment ev;
   CORBA_exception_init(&ev);
 
-  view->private = g_new (NautilusViewFramePrivate, 1);
+  view->private = g_new0 (NautilusViewFramePrivate, 1);
 
   bonobo_object_construct (BONOBO_OBJECT (view), impl_Nautilus_View__create (view, &ev));
 
@@ -392,14 +392,16 @@ nautilus_view_frame_ensure_view_frame (NautilusViewFrame *view)
 
   CORBA_exception_init (&ev);
 
-  if (CORBA_Object_is_nil (view->private->view_frame, &ev))
+  if (CORBA_Object_is_nil (view->private->view_frame, &ev)) {
     view->private->view_frame = Bonobo_Unknown_query_interface 
       (bonobo_control_get_control_frame 
        (BONOBO_CONTROL (nautilus_view_frame_get_bonobo_control (view))),
        "IDL:Nautilus/ViewFrame:1.0", &ev);
+    if (ev._major != CORBA_NO_EXCEPTION) {
+      view->private->view_frame = CORBA_OBJECT_NIL;
+    }
+  }
 
-  if (ev._major != CORBA_NO_EXCEPTION)
-    view->private->view_frame = CORBA_OBJECT_NIL;
 
   if (CORBA_Object_is_nil (view->private->view_frame, &ev)) {
     CORBA_exception_free (&ev);
@@ -419,6 +421,8 @@ nautilus_view_frame_request_location_change (NautilusViewFrame *view,
   g_return_if_fail (view != NULL);
   g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view));
 
+  CORBA_exception_init (&ev);
+
   if (nautilus_view_frame_ensure_view_frame (view)) {
     Nautilus_ViewFrame_request_location_change(view->private->view_frame, loc, &ev);
     if(ev._major != CORBA_NO_EXCEPTION)
diff --git a/libnautilus/ntl-view-frame.c b/libnautilus/ntl-view-frame.c
index 8aa52104b..ff7c1f74a 100644
--- a/libnautilus/ntl-view-frame.c
+++ b/libnautilus/ntl-view-frame.c
@@ -340,7 +340,7 @@ nautilus_view_frame_init (NautilusViewFrame *view)
   CORBA_Environment ev;
   CORBA_exception_init(&ev);
 
-  view->private = g_new (NautilusViewFramePrivate, 1);
+  view->private = g_new0 (NautilusViewFramePrivate, 1);
 
   bonobo_object_construct (BONOBO_OBJECT (view), impl_Nautilus_View__create (view, &ev));
 
@@ -392,14 +392,16 @@ nautilus_view_frame_ensure_view_frame (NautilusViewFrame *view)
 
   CORBA_exception_init (&ev);
 
-  if (CORBA_Object_is_nil (view->private->view_frame, &ev))
+  if (CORBA_Object_is_nil (view->private->view_frame, &ev)) {
     view->private->view_frame = Bonobo_Unknown_query_interface 
       (bonobo_control_get_control_frame 
        (BONOBO_CONTROL (nautilus_view_frame_get_bonobo_control (view))),
        "IDL:Nautilus/ViewFrame:1.0", &ev);
+    if (ev._major != CORBA_NO_EXCEPTION) {
+      view->private->view_frame = CORBA_OBJECT_NIL;
+    }
+  }
 
-  if (ev._major != CORBA_NO_EXCEPTION)
-    view->private->view_frame = CORBA_OBJECT_NIL;
 
   if (CORBA_Object_is_nil (view->private->view_frame, &ev)) {
     CORBA_exception_free (&ev);
@@ -419,6 +421,8 @@ nautilus_view_frame_request_location_change (NautilusViewFrame *view,
   g_return_if_fail (view != NULL);
   g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view));
 
+  CORBA_exception_init (&ev);
+
   if (nautilus_view_frame_ensure_view_frame (view)) {
     Nautilus_ViewFrame_request_location_change(view->private->view_frame, loc, &ev);
     if(ev._major != CORBA_NO_EXCEPTION)