From b7b8c5ec58a241e524435db41cbe798109f175dc Mon Sep 17 00:00:00 2001 From: padraigo Date: Tue, 19 Aug 2003 12:58:03 +0000 Subject: [PATCH] 2003-08-19 Padraig O'Briain * cspi/spi-private.h: Add declaration for _cspi_exceptoin_throw * cspi/spi_accessible.c (cspi_init_relation_type_table): Add call to return a value. * cspi/spi_event.c: (AccessibleEvent_unref); Add casts to gfree arguments. * cspi/spi_main.c (SPI_Exception_getSourceType); Return the correct type for unspecified exception. * cspi_streamablecontect): Add include of string.h for memcpy. (stream_release): Correct call to bonobo_object_release_unref (stream_cache_item_free): Correct call to bonobo_object_release_unref * cspi/bonobo/spi-bonobo.c: (cspi_check_event): Add cast to second argument of _cspi_expection_throw. * libspi/hyperlink.c: Add include of libspi/action.h: (spi_hyperlink_new): Cast argument to spi_action_interface_new. * libspi/streamablecontent.c: add include of libspi/component.h. * regisrtyd/deviceeventcontroller.c: (spi_dec_translate_mask): Removed unused variable priv. (dec_synth_keysym): Initialize lock_mods to avoid compilker warning/ * registryd/registry.c: (registry_filter_event): Remove unused variable queue_is-empty. (impl_registry_notify_event): Use correct modifier in fprintf call. This fixes compiler warnings reported in bug #120220. git-svn-id: http://svn.gnome.org/svn/at-spi/trunk@527 e2bd861d-eb25-0410-b326-f6ed22b6b98c --- ChangeLog | 26 ++++++++++++++++++++++++++ cspi/spi-private.h | 2 ++ cspi/spi_accessible.c | 1 + cspi/spi_event.c | 4 ++-- cspi/spi_main.c | 2 +- cspi/spi_streamablecontent.c | 9 +++++++-- 6 files changed, 39 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 80e08c5..cdc0278 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,29 @@ +2003-08-19 Padraig O'Briain + + * cspi/spi-private.h: Add declaration for _cspi_exceptoin_throw + * cspi/spi_accessible.c (cspi_init_relation_type_table): Add call + to return a value. + * cspi/spi_event.c: (AccessibleEvent_unref); Add casts to gfree + arguments. + * cspi/spi_main.c (SPI_Exception_getSourceType); Return the correct + type for unspecified exception. + * cspi_streamablecontect): Add include of string.h for memcpy. + (stream_release): Correct call to bonobo_object_release_unref + (stream_cache_item_free): Correct call to bonobo_object_release_unref + * cspi/bonobo/spi-bonobo.c: (cspi_check_event): Add cast to second + argument of _cspi_expection_throw. + * libspi/hyperlink.c: Add include of libspi/action.h: + (spi_hyperlink_new): Cast argument to spi_action_interface_new. + * libspi/streamablecontent.c: add include of libspi/component.h. + * regisrtyd/deviceeventcontroller.c: + (spi_dec_translate_mask): Removed unused variable priv. + (dec_synth_keysym): Initialize lock_mods to avoid compilker warning/ + * registryd/registry.c: + (registry_filter_event): Remove unused variable queue_is-empty. + (impl_registry_notify_event): Use correct modifier in fprintf call. + + This fixes compiler warnings reported in bug #120220. + 2003-08-18 Padraig O'Briain * registryd/registryd.c: Remove this file. diff --git a/cspi/spi-private.h b/cspi/spi-private.h index eeb933f..bbff0c1 100644 --- a/cspi/spi-private.h +++ b/cspi/spi-private.h @@ -80,6 +80,8 @@ void cspi_object_return (Accessible *accessible); SPIBoolean cspi_accessible_is_a (Accessible *accessible, const char *interface_name); void cspi_streams_close_all (void); +gboolean _cspi_exception_throw (CORBA_Environment *ev, char *desc_prefix); + #define cspi_return_if_fail(val) \ if (!(val)) \ diff --git a/cspi/spi_accessible.c b/cspi/spi_accessible.c index 4e34f06..7bd4a85 100644 --- a/cspi/spi_accessible.c +++ b/cspi/spi_accessible.c @@ -989,6 +989,7 @@ cspi_init_relation_type_table (AccessibleRelationType *relation_type_table) relation_type_table [Accessibility_RELATION_EMBEDDED_BY] = SPI_RELATION_EMBEDDED_BY; relation_type_table [Accessibility_RELATION_POPUP_FOR] = SPI_RELATION_POPUP_FOR; relation_type_table [Accessibility_RELATION_LAST_DEFINED] = SPI_RELATION_LAST_DEFINED; + return TRUE; } static AccessibleRelationType diff --git a/cspi/spi_event.c b/cspi/spi_event.c index ab66124..695f1a2 100644 --- a/cspi/spi_event.c +++ b/cspi/spi_event.c @@ -706,10 +706,10 @@ AccessibleEvent_unref (const AccessibleEvent *e) if (event->ref_count < 1) { cspi_internal_event_remove (event); - g_free (e->type); + g_free ((gpointer)e->type); Accessible_unref (e->source); CORBA_free (event->data); - g_free (e); + g_free ((gpointer)e); } } } diff --git a/cspi/spi_main.c b/cspi/spi_main.c index e32a5d0..f54b60a 100644 --- a/cspi/spi_main.c +++ b/cspi/spi_main.c @@ -569,7 +569,7 @@ SPIExceptionType SPIException_getSourceType (SPIException *err) if (err) return err->type; else - return SPI_EXCEPTION_UNSPECIFIED; + return SPI_EXCEPTION_SOURCE_UNSPECIFIED; } /** diff --git a/cspi/spi_streamablecontent.c b/cspi/spi_streamablecontent.c index 6147960..500b339 100644 --- a/cspi/spi_streamablecontent.c +++ b/cspi/spi_streamablecontent.c @@ -21,6 +21,8 @@ * Boston, MA 02111-1307, USA. */ +#include +#include #include @@ -41,15 +43,18 @@ streams_equal_func (gconstpointer a, gconstpointer b) static void stream_release (gpointer a) { - bonobo_object_release_unref (a); + CORBA_Environment ev; + + bonobo_object_release_unref (a, &ev); } static void stream_cache_item_free (gpointer a) { struct StreamCacheItem *cache_item = a; + CORBA_Environment ev; if (cache_item) { - bonobo_object_release_unref (cache_item->stream); + bonobo_object_release_unref (cache_item->stream, &ev); SPI_freeString (cache_item->mimetype); g_free (cache_item); } -- 2.7.4