Add Hypertext and Hyperlink and some refactoring to support them

AtspiAccessible is now derived from a base class called AtspiObject which
defines the object's application and object path, since this is common with
AtspiHyperlink.

1 files changed, 5 insertions, 4 deletions

diff --git a/atspi/atspi-accessible.h b/atspi/atspi-accessible.h
index f4f4fdc4..e2a95fef 100644
--- a/atspi/atspi-accessible.h
+++ b/atspi/atspi-accessible.h
@@ -29,6 +29,7 @@
 
 #include "atspi-application.h"
 #include "atspi-constants.h"
+#include "atspi-object.h"
 #include "atspi-stateset.h"
 #include "atspi-types.h"
 
@@ -41,11 +42,9 @@
 
 struct _AtspiAccessible
 {
-  GObject parent;
+  AtspiObject parent;
   AtspiAccessible *accessible_parent;
   GList *children;
-  AtspiApplication *app;
-  char *path;
   AtspiRole role;
   gint interfaces;
   char *name;
@@ -57,7 +56,7 @@ struct _AtspiAccessible
 typedef struct _AtspiAccessibleClass AtspiAccessibleClass;
 struct _AtspiAccessibleClass
 {
-  GObjectClass parent_class;
+  AtspiObjectClass parent_class;
 };
 
 GType atspi_accessible_get_type (void); 
@@ -103,6 +102,8 @@ AtspiDocument * atspi_accessible_get_document (AtspiAccessible *obj);
 
 AtspiEditableText * atspi_accessible_get_editable_text (AtspiAccessible *obj);
 
+AtspiHypertext * atspi_accessible_get_hypertext (AtspiAccessible *obj);
+
 AtspiImage * atspi_accessible_get_image (AtspiAccessible *obj);
 
 AtspiSelection * atspi_accessible_get_selection (AtspiAccessible *obj);