From dd8fbc44011aa6002bc70f1b7dbb8b15023f9f81 Mon Sep 17 00:00:00 2001 From: padraigo Date: Tue, 19 Aug 2003 13:09:43 +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@528 e2bd861d-eb25-0410-b326-f6ed22b6b98c --- cspi/bonobo/cspi-bonobo.c | 2 +- libspi/hyperlink.c | 3 ++- libspi/streamablecontent.c | 1 + registryd/deviceeventcontroller.c | 3 +-- registryd/registry.c | 3 +-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cspi/bonobo/cspi-bonobo.c b/cspi/bonobo/cspi-bonobo.c index df59028..cf18e25 100644 --- a/cspi/bonobo/cspi-bonobo.c +++ b/cspi/bonobo/cspi-bonobo.c @@ -49,7 +49,7 @@ cspi_check_ev (const char *error_string) err = bonobo_exception_get_text (ev); - if (!_cspi_exception_throw (ev, error_string)) { + if (!_cspi_exception_throw (ev, (char *) error_string)) { fprintf (stderr, "Warning: AT-SPI error: %s: %s\n", error_string, err); } diff --git a/libspi/hyperlink.c b/libspi/hyperlink.c index ef41984..7afc19d 100644 --- a/libspi/hyperlink.c +++ b/libspi/hyperlink.c @@ -26,6 +26,7 @@ #include #include #include +#include #include /* Static function declarations */ @@ -98,7 +99,7 @@ spi_hyperlink_new (AtkHyperlink *object) if (ATK_IS_ACTION (object)) { bonobo_object_add_interface (bonobo_object (new_hyperlink), - BONOBO_OBJECT (spi_action_interface_new (object))); + BONOBO_OBJECT (spi_action_interface_new (ATK_OBJECT (object)))); } return new_hyperlink; } diff --git a/libspi/streamablecontent.c b/libspi/streamablecontent.c index 1c7f4e5..df66141 100644 --- a/libspi/streamablecontent.c +++ b/libspi/streamablecontent.c @@ -26,6 +26,7 @@ #include #include #include +#include #include /* Our parent Gtk object type */ diff --git a/registryd/deviceeventcontroller.c b/registryd/deviceeventcontroller.c index 1e44fc7..07fd059 100644 --- a/registryd/deviceeventcontroller.c +++ b/registryd/deviceeventcontroller.c @@ -568,8 +568,6 @@ spi_dec_init_mouse_listener (SpiRegistry *registry) static Accessibility_ControllerEventMask spi_dec_translate_mask (Accessibility_ControllerEventMask mask) { - DEControllerPrivateData *priv; - if (mask == SPI_KEYMASK_NUMLOCK) { mask = _numlock_physical_mask; } @@ -2003,6 +2001,7 @@ dec_synth_keysym (SpiDEController *controller, KeySym keysym) modifiers = dec_get_modifier_state (controller); /* side-effect; we may unset mousebutton modifiers here! */ + lock_mods = 0; if (synth_mods != modifiers) { lock_mods = synth_mods & ~modifiers; dec_lock_modifiers (controller, lock_mods); diff --git a/registryd/registry.c b/registryd/registry.c index b489bbd..70bb7f5 100644 --- a/registryd/registry.c +++ b/registryd/registry.c @@ -773,7 +773,6 @@ static gboolean registry_filter_event (SpiRegistry *registry, NotifyContext *ctx, CORBA_Environment *ev) { - gboolean queue_is_empty = FALSE; g_assert (ctx != NULL); /* case #1 is not yet used */ @@ -823,7 +822,7 @@ impl_registry_notify_event (PortableServer_Servant servant, if (ctx.etype.type_cat != ETYPE_MOUSE) { fprintf (stderr, "emit! %s level: %d\n", ctx.etype.event_name, level); - fprintf (stderr, "emit! %p %p\n", ctx.e_out, ctx.e_out.type); + fprintf (stderr, "emit! %p %x\n", ctx.e_out, ctx.e_out.type); } #endif registry_emit_event (registry, &ctx); -- 2.7.4