From 6a5ed57f402081d394f26bb7ce5ce766a758bfd1 Mon Sep 17 00:00:00 2001 From: billh Date: Mon, 13 May 2002 09:37:45 +0000 Subject: [PATCH] Fix for bugzilla 80608, events with detail strings don't get dispatched correctly. Fixed quarking code which was causing this problem. git-svn-id: http://svn.gnome.org/svn/at-spi/trunk@296 e2bd861d-eb25-0410-b326-f6ed22b6b98c --- ChangeLog | 45 ++++++++++++++++++++++++++++----------------- registryd/registry.c | 14 ++++---------- 2 files changed, 32 insertions(+), 27 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0dc8ab9..f922ac8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,24 @@ +2002-05-11 Bill Haneman + + * registryd/registry.c: + Fixed quarking bug in event string parsing; now events with + detail parameters get matched correctly to listeners. + [Bugzilla 80608]. + + * util/idl/Magnifier.idl: remove. + * util/idl: remove + * util/*.[ch]: Remove. + Magnification utilities and IDL are now in module gnome-mag. + +2002-05-10 Bill Haneman + + * registryd/deviceeventcontroller.c: + Fixed bug in grab key conversion which was causing keycode grabs + to be converted to AnyKey grabs. + + * NEWS: + updated NEWS file to reflect recent spin-off of gnome-mag. + 2002-05-09 Marc Mulcahy * cspi/spi_accessible.c: Added exception checks. Fixed completely @@ -25,25 +46,10 @@ on error which is technically valid-- changed these to return -1. Added marshaller for text boundary types to fix bug with boundary types being passed incorrectly to atk. - - -2002-05-03 Marc Mulcahy - - * cspi/bonobo/cspi-bonobo.c cspi/bonobo/cspi-bonobo-listener.c - cspi/bonobo/cspi-bonobo-listener.h: Added copyright notice. - -2002-05-10 Bill Haneman - - * registryd/deviceeventcontroller.c: - Fixed bug in grab key conversion which was causing keycode grabs - to be converted to AnyKey grabs. - - * NEWS: - updated NEWS file to reflect recent spin-off of gnome-mag. - - + 2002-05-09 Bill Haneman + * cspi/spi_registry.c: Fixed nasty bug in SPI_registerAccessibleKeystrokeListener which was uncovered by the recent key changes. @@ -87,6 +93,11 @@ NOTE: Split magnifier binary, IDL, and magnification activation code from at-spi into module gnome-mag. +2002-05-03 Marc Mulcahy + + * cspi/bonobo/cspi-bonobo.c cspi/bonobo/cspi-bonobo-listener.c + cspi/bonobo/cspi-bonobo-listener.h: Added copyright notice. + 2002-05-03 Bill Haneman * configure.in: diff --git a/registryd/registry.c b/registryd/registry.c index a0ff39a..c4e93d9 100644 --- a/registryd/registry.c +++ b/registryd/registry.c @@ -90,7 +90,7 @@ desktop_add_application (SpiDesktop *desktop, Accessibility_Event e; CORBA_Environment ev; - e.type = g_strdup ("object:children-changed::add"); + e.type = g_strdup ("object:children-changed:add"); e.source = BONOBO_OBJREF (desktop); e.detail1 = index; e.detail2 = 0; @@ -110,7 +110,7 @@ desktop_remove_application (SpiDesktop *desktop, Accessibility_Event e; CORBA_Environment ev; - e.type = g_strdup ("object:children-changed::remove"); + e.type = g_strdup ("object:children-changed:remove"); e.source = BONOBO_OBJREF (desktop); e.detail1 = index; e.detail2 = 0; @@ -261,6 +261,7 @@ parse_event_type (EventTypeStruct *etype, const char *event_name) if (split_string[1]) { + etype->major = g_quark_from_string (split_string[1]); if (split_string[2]) { etype->minor = g_quark_from_string (s = g_strconcat (split_string[1], split_string[2], NULL)); @@ -268,23 +269,16 @@ parse_event_type (EventTypeStruct *etype, const char *event_name) if (split_string[3]) { etype->detail = g_quark_from_string (split_string[3]); - s = g_strconcat (split_string[1], split_string[2], split_string[3], NULL); - etype->major = g_quark_from_string (s); - g_free (s); } else { etype->detail = g_quark_from_static_string (""); - s = g_strconcat (split_string[1], split_string[2], NULL); - etype->major = g_quark_from_string (s); - g_free (s); } } else { - etype->major = g_quark_from_string (split_string[1]); etype->minor = etype->major; - etype->detail = etype->major; + etype->detail = g_quark_from_static_string (""); //etype->major; } } else -- 2.7.4