From 041a5b0240fda53d0c0a276856b33c01c04e72fa Mon Sep 17 00:00:00 2001 From: Padraig O'Briain Date: Mon, 15 Apr 2002 10:54:44 +0000 Subject: [PATCH] Allow for case where created AtkObject is not a AtkGObjectAccessible so * atk/atkgobjectaccessible.c: (atk_gobject_accessible_for_object): Allow for case where created AtkObject is not a AtkGObjectAccessible so quark_accessible_object was not initialized in atk_gobject_accessible_class_init --- ChangeLog | 7 +++++++ atk/atkgobjectaccessible.c | 10 +++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 08ade8d..2ac2cf9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2002-04-15 Padraig O'Briain + + * atk/atkgobjectaccessible.c: + (atk_gobject_accessible_for_object): Allow for case where created + AtkObject is not a AtkGObjectAccessible so quark_accessible_object + was not initialized in atk_gobject_accessible_class_init + Thu Mar 28 18:27:32 2002 Owen Taylor * ===== Released 1.0.1 ====== diff --git a/atk/atkgobjectaccessible.c b/atk/atkgobjectaccessible.c index 99b3ecd..41b4def 100644 --- a/atk/atkgobjectaccessible.c +++ b/atk/atkgobjectaccessible.c @@ -85,6 +85,13 @@ atk_gobject_accessible_for_object (GObject *obj) G_OBJECT_TYPE (obj)); accessible = atk_object_factory_create_accessible (factory, obj); + if (!quark_accessible_object) + { + /* + * The AtkObject which was created was not a AtkGObjectAccessible + */ + quark_accessible_object = g_quark_from_static_string ("accessible-object"); + } g_object_set_qdata (obj, quark_accessible_object, accessible); } return accessible; @@ -144,6 +151,7 @@ atk_gobject_accessible_class_init (AtkGObjectAccessibleClass *klass) class->initialize = atk_real_gobject_accessible_initialize; - quark_accessible_object = g_quark_from_static_string ("accessible-object"); + if (!quark_accessible_object) + quark_accessible_object = g_quark_from_static_string ("accessible-object"); quark_object = g_quark_from_static_string ("object-for-accessible"); } -- 2.7.4