2003-01-27 Padraig O'Briain <padraig.obriain@sun.com

[platform/core/uifw/at-spi2-atk.git] / cspi / spi_main.c

diff --git a/cspi/spi_main.c b/cspi/spi_main.c
index 9a6b45d..5117486 100644 (file)
--- a/cspi/spi_main.c
+++ b/cspi/spi_main.c
@@ -126,6 +126,7 @@ cspi_get_live_refs (void)
 CORBA_Environment *
 cspi_ev (void)
 {
+  CORBA_exception_init (&ev);
   return &ev;
 }
 
@@ -248,15 +249,17 @@ cspi_object_take (CORBA_Object corba_object)
 {
   Accessible *accessible;
   accessible = cspi_object_borrow (corba_object);
-  cspi_object_ref (accessible->objref);
+
+  cspi_object_ref (accessible);
   /* 
    * if the remote object is dead, 
    * cspi_object_return will throw an exception. 
+   * FIXME: what clears that exception context ever ?
    */
-  cspi_object_return (accessible->objref);
+  cspi_object_return (accessible);
   if (cspi_exception ()) 
     {
-      cspi_object_unref (accessible->objref);
+      cspi_object_unref (accessible);
       accessible = NULL;
     }
   return accessible;