From cce24ca259d92a12e5cb84fa64cba9f6e2f8a96a Mon Sep 17 00:00:00 2001 From: michael Date: Fri, 13 Jun 2003 12:43:05 +0000 Subject: [PATCH] 2003-06-13 Michael Meeks * cspi/bonobo/cspi-bonobo.c (cspi_check_ev): use it. * cspi/spi_main.c (cspi_peek_ev): impl. git-svn-id: http://svn.gnome.org/svn/at-spi/trunk@446 e2bd861d-eb25-0410-b326-f6ed22b6b98c --- ChangeLog | 6 ++++++ cspi/bonobo/cspi-bonobo.c | 2 +- cspi/spi-private.h | 1 + cspi/spi_main.c | 6 ++++++ 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 27eb8db..e5d8bc6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2003-06-13 Michael Meeks + + * cspi/bonobo/cspi-bonobo.c (cspi_check_ev): use it. + + * cspi/spi_main.c (cspi_peek_ev): impl. + 2003-06-11 Padraig O'Briain * cspi/spi-roletypes.h: Add role SPI_ROLE_AUTOCOMPLETE diff --git a/cspi/bonobo/cspi-bonobo.c b/cspi/bonobo/cspi-bonobo.c index 2422dda..df59028 100644 --- a/cspi/bonobo/cspi-bonobo.c +++ b/cspi/bonobo/cspi-bonobo.c @@ -41,7 +41,7 @@ cspi_release_unref (CORBA_Object object) 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) { diff --git a/cspi/spi-private.h b/cspi/spi-private.h index 2f2bf4d..eeb933f 100644 --- a/cspi/spi-private.h +++ b/cspi/spi-private.h @@ -68,6 +68,7 @@ struct _SPIException { #define CSPI_OBJREF(a) (((Accessible *)(a))->objref) CORBA_Environment *cspi_ev (void); +CORBA_Environment *cspi_peek_ev (void); SPIBoolean cspi_exception (void); Accessibility_Registry cspi_registry (void); Accessible *cspi_object_add (CORBA_Object corba_object); diff --git a/cspi/spi_main.c b/cspi/spi_main.c index f2a4e46..e32a5d0 100644 --- a/cspi/spi_main.c +++ b/cspi/spi_main.c @@ -157,6 +157,12 @@ cspi_get_live_refs (void) } CORBA_Environment * +cspi_peek_ev (void) +{ + return &ev; +} + +CORBA_Environment * cspi_ev (void) { CORBA_exception_init (&ev); -- 2.7.4