2001-12-10 Michael Meeks <michael@ximian.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 19c7420..0bc3a6c 100644 (file)
--- a/cspi/spi_main.c
+++ b/cspi/spi_main.c
@@ -144,6 +144,10 @@ cspi_object_add (CORBA_Object corba_object)
     {
       ref = NULL;
     }
+  else if (!cspi_check_ev ("pre method check"))
+    {
+      ref = NULL;
+    }
   else
     {
       if ((ref = g_hash_table_lookup (get_live_refs (), corba_object)))
@@ -173,31 +177,6 @@ cspi_object_add (CORBA_Object corba_object)
   return ref;
 }
 
-Accessible *
-cspi_object_add_check (CORBA_Object corba_object)
-{
-  Accessible *retval;
-
-  if (ev._major == CORBA_USER_EXCEPTION &&
-      !strcmp (ev._id, ex_Accessibility_ChildGone))
-    {
-      retval = NULL;
-    }
-  else if (ev._major != CORBA_NO_EXCEPTION)
-    {
-      cspi_check_ev (cspi_ev (), "pre method check");
-      retval = NULL;
-    }
-  else
-    {
-      retval = cspi_object_add (corba_object);
-
-      cspi_check_ev (cspi_ev (), "post method check");
-    }
-
-  return retval;
-}
-
 void
 cspi_object_ref (Accessible *accessible)
 {