From 4c3b1c682d49985a13a663f4fd51d4571f869c6e Mon Sep 17 00:00:00 2001 From: liyuan Date: Wed, 13 Dec 2006 04:29:44 +0000 Subject: [PATCH] 2006-12-13 Li Yuan Patch from Ariel Rios to fix #163132 and #377079. * atk-bridge/bridge.c: (spi_atk_bridge_do_registration), (spi_atk_bridge_get_registry_ior): Use g_warning instead of g_error and g_critical to avoid crash. git-svn-id: http://svn.gnome.org/svn/at-spi/trunk@868 e2bd861d-eb25-0410-b326-f6ed22b6b98c --- ChangeLog | 7 +++++++ atk-bridge/bridge.c | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4ca030c..3f3e43f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-12-13 Li Yuan + + Patch from Ariel Rios to fix #163132 and #377079. + * atk-bridge/bridge.c: (spi_atk_bridge_do_registration), + (spi_atk_bridge_get_registry_ior): + Use g_warning instead of g_error and g_critical to avoid crash. + 2006-12-11 Bill Haneman * libspi/text.c: diff --git a/atk-bridge/bridge.c b/atk-bridge/bridge.c index fd00be6..3aee597 100644 --- a/atk-bridge/bridge.c +++ b/atk-bridge/bridge.c @@ -247,7 +247,7 @@ spi_atk_bridge_do_registration (void) if (spi_atk_bridge_get_registry () == CORBA_OBJECT_NIL) { - g_error ("Could not locate registry"); + g_warning ("Could not locate registry"); return FALSE; } @@ -366,7 +366,7 @@ spi_atk_bridge_get_registry_ior (void) (Atom) 31, &actual_type, &actual_format, &nitems, &leftover, &data); if (data == NULL) - g_critical (_("AT_SPI_REGISTRY was not started at session startup.")); + g_warning (_("AT_SPI_REGISTRY was not started at session startup.")); return (gchar *) data; -- 2.7.4