Revved to 0.3.12.

[platform/upstream/at-spi2-core.git] / cspi / bonobo / cspi-bonobo.c

diff --git a/cspi/bonobo/cspi-bonobo.c b/cspi/bonobo/cspi-bonobo.c
index 57ed06a..252306b 100644 (file)
--- a/cspi/bonobo/cspi-bonobo.c
+++ b/cspi/bonobo/cspi-bonobo.c
@@ -29,19 +29,19 @@
 CORBA_Object
 cspi_dup_ref (CORBA_Object object)
 {
-  return bonobo_object_dup_ref (object, NULL);
+  return bonobo_object_dup_ref (object, cspi_ev ());
 }
 
 void
 cspi_release_unref (CORBA_Object object)
 {
-  bonobo_object_release_unref (object, NULL);
+    bonobo_object_release_unref (object, NULL); 
 }
 
 SPIBoolean
 cspi_check_ev (const char *error_string)
 {
-  CORBA_Environment *ev = cspi_ev ();
+  CORBA_Environment *ev = cspi_peek_ev ();
 
   if (ev->_major != CORBA_NO_EXCEPTION)
     {
@@ -49,8 +49,10 @@ cspi_check_ev (const char *error_string)
 
       err = bonobo_exception_get_text (ev);
 
-      fprintf (stderr, "Warning: AT-SPI error: %s: %s\n",
-              error_string, err);
+      if (!_cspi_exception_throw (ev, (char *) error_string)) {
+       fprintf (stderr, "Warning: AT-SPI error: %s: %s\n",
+                error_string, err);
+      }
 
       g_free (err);