[atk] Revert "atkimplementor: use the G_DEFINE_INTERFACE macro to declare it as interface in the introspec
- From: Alejandro Piñeiro <apinheiro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [atk] Revert "atkimplementor: use the G_DEFINE_INTERFACE macro to declare it as interface in the introspec
- Date: Tue, 19 Feb 2019 15:48:14 +0000 (UTC)
commit 96d13ae47f6f77445483ee8a0d7d6569a95f35bf
Author: Alejandro Piñeiro <apinheiro igalia com>
Date: Tue Feb 19 16:46:16 2019 +0100
Revert "atkimplementor: use the G_DEFINE_INTERFACE macro to declare it as interface in the introspection"
This reverts commit 30f2712c5bbffbc03e98272c852d29b4bdf8b52e.
Fixes https://gitlab.gnome.org/GNOME/atk/issues/1
atk/atkobject.c | 22 +++++++++++++++++-----
atk/atkobject.h | 2 +-
2 files changed, 18 insertions(+), 6 deletions(-)
---
diff --git a/atk/atkobject.c b/atk/atkobject.c
index f8e855e..d50be54 100644
--- a/atk/atkobject.c
+++ b/atk/atkobject.c
@@ -57,9 +57,6 @@
*
*/
-typedef AtkImplementorIface AtkImplementorInterface;
-G_DEFINE_INTERFACE (AtkImplementor, atk_implementor, G_TYPE_OBJECT)
-
static GPtrArray *role_names = NULL;
enum
@@ -680,9 +677,24 @@ atk_object_init (AtkObject *accessible,
accessible->role = ATK_ROLE_UNKNOWN;
}
-static void
-atk_implementor_default_init (AtkImplementorInterface *iface)
+GType
+atk_implementor_get_type (void)
{
+ static GType type = 0;
+
+ if (!type)
+ {
+ static const GTypeInfo typeInfo =
+ {
+ sizeof (AtkImplementorIface),
+ (GBaseInitFunc) NULL,
+ (GBaseFinalizeFunc) NULL,
+ } ;
+
+ type = g_type_register_static (G_TYPE_INTERFACE, "AtkImplementorIface", &typeInfo, 0) ;
+ }
+
+ return type;
}
/**
diff --git a/atk/atkobject.h b/atk/atkobject.h
index 4cb8ce2..711dda7 100644
--- a/atk/atkobject.h
+++ b/atk/atkobject.h
@@ -678,7 +678,7 @@ struct _AtkImplementorIface
};
ATK_AVAILABLE_IN_ALL
-GType atk_implementor_get_type (void) G_GNUC_CONST;
+GType atk_implementor_get_type (void);
ATK_AVAILABLE_IN_ALL
AtkObject* atk_implementor_ref_accessible (AtkImplementor *implementor);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]