2001-11-19 Michael Meeks <michael@ximian.com>

[platform/core/uifw/at-spi2-atk.git] / libspi / hyperlink.c

diff --git a/libspi/hyperlink.c b/libspi/hyperlink.c
index 5d0c72f..13086ea 100644 (file)
--- a/libspi/hyperlink.c
+++ b/libspi/hyperlink.c
@@ -38,17 +38,18 @@
  * This pulls the definition of the hyperlink bonobo object
  */
 #include "hyperlink.h"
+#include "accessible.h"
 
 /*
  * Static function declarations
  */
 
 static void
-hyperlink_class_init (HyperlinkClass *klass);
+spi_hyperlink_class_init (SpiHyperlinkClass *klass);
 static void
-hyperlink_init (Hyperlink *hyperlink);
+spi_hyperlink_init (SpiHyperlink *hyperlink);
 static void
-hyperlink_finalize (GObject *obj);
+spi_hyperlink_finalize (GObject *obj);
 static CORBA_string
 impl_getURI (PortableServer_Servant _servant,
             const CORBA_long i, CORBA_Environment * ev);
@@ -71,50 +72,20 @@ impl_isValid (PortableServer_Servant _servant,
 
 static GObjectClass *parent_class;
 
-GType
-hyperlink_get_type (void)
-{
-  static GType type = 0;
-
-  if (!type) {
-    static const GTypeInfo tinfo = {
-      sizeof (HyperlinkClass),
-      (GBaseInitFunc) NULL,
-      (GBaseFinalizeFunc) NULL,
-      (GClassInitFunc) hyperlink_class_init,
-      (GClassFinalizeFunc) NULL,
-      NULL, /* class data */
-      sizeof (Hyperlink),
-      0, /* n preallocs */
-      (GInstanceInitFunc) hyperlink_init,
-                        NULL /* value table */
-    };
-
-    /*
-     * Bonobo_type_unique auto-generates a load of
-     * CORBA structures for us. All derived types must
-     * use bonobo_type_unique.
-     */
-    type = bonobo_type_unique (
-                              BONOBO_OBJECT_TYPE,
-                              POA_Accessibility_Hyperlink__init,
-                              NULL,
-                              G_STRUCT_OFFSET (HyperlinkClass, epv),
-                              &tinfo,
-                              "AccessibleHyperlink");
-  }
-
-  return type;
-}
+
+BONOBO_TYPE_FUNC_FULL (SpiHyperlink,
+                      Accessibility_Hyperlink,
+                      BONOBO_OBJECT_TYPE,
+                      spi_hyperlink);
 
 static void
-hyperlink_class_init (HyperlinkClass *klass)
+spi_hyperlink_class_init (SpiHyperlinkClass *klass)
 {
   GObjectClass * object_class = (GObjectClass *) klass;
   POA_Accessibility_Hyperlink__epv *epv = &klass->epv;
   parent_class = g_type_class_peek_parent (klass);
 
-  object_class->finalize = hyperlink_finalize;
+  object_class->finalize = spi_hyperlink_finalize;
 
   /* Initialize epv table */
 
@@ -127,26 +98,26 @@ hyperlink_class_init (HyperlinkClass *klass)
 }
 
 static void
-hyperlink_init (Hyperlink *hyperlink)
+spi_hyperlink_init (SpiHyperlink *hyperlink)
 {
 }
 
 static void
-hyperlink_finalize (GObject *obj)
+spi_hyperlink_finalize (GObject *obj)
 {
-  Hyperlink *hyperlink = HYPERLINK(obj);
-  g_object_unref (hyperlink->atko);
-  hyperlink->atko = NULL;
+  SpiHyperlink *hyperlink = SPI_HYPERLINK(obj);
+  g_object_unref (hyperlink->hyperlink);
+  hyperlink->hyperlink = NULL;
   parent_class->finalize (obj);
 }
 
-Hyperlink *
-hyperlink_interface_new (AtkObject *obj)
+SpiHyperlink *
+spi_hyperlink_new (AtkHyperlink *hyperlink)
 {
-  Hyperlink *new_hyperlink = 
-    HYPERLINK(g_object_new (HYPERLINK_TYPE, NULL));
-  new_hyperlink->atko = obj;
-  g_object_ref (obj);
+  SpiHyperlink *new_hyperlink = 
+    SPI_HYPERLINK(g_object_new (SPI_HYPERLINK_TYPE, NULL));
+  g_object_ref (hyperlink);
+  new_hyperlink->hyperlink = hyperlink;
   return new_hyperlink;
 }
 
@@ -156,8 +127,8 @@ static CORBA_short
 impl__get_n_anchors (PortableServer_Servant _servant,
                     CORBA_Environment * ev)
 {
-  Hyperlink *link = HYPERLINK(bonobo_object_from_servant(_servant));
-  return (CORBA_short) atk_hyperlink_get_n_anchors (ATK_HYPERLINK(link->atko));
+  SpiHyperlink *link = SPI_HYPERLINK(bonobo_object_from_servant(_servant));
+  return (CORBA_short) atk_hyperlink_get_n_anchors (ATK_HYPERLINK(link->hyperlink));
 }
 
 
@@ -166,8 +137,8 @@ static CORBA_long
 impl__get_startIndex (PortableServer_Servant _servant,
                      CORBA_Environment * ev)
 {
-  Hyperlink *link = HYPERLINK(bonobo_object_from_servant(_servant));
-  return (CORBA_long) atk_hyperlink_get_start_index (ATK_HYPERLINK(link->atko));
+  SpiHyperlink *link = SPI_HYPERLINK(bonobo_object_from_servant(_servant));
+  return (CORBA_long) atk_hyperlink_get_start_index (ATK_HYPERLINK(link->hyperlink));
 }
 
 
@@ -176,8 +147,8 @@ static CORBA_long
 impl__get_endIndex (PortableServer_Servant _servant,
                    CORBA_Environment * ev)
 {
-  Hyperlink *link = HYPERLINK(bonobo_object_from_servant(_servant));
-  return (CORBA_long) atk_hyperlink_get_end_index (ATK_HYPERLINK(link->atko));
+  SpiHyperlink *link = SPI_HYPERLINK(bonobo_object_from_servant(_servant));
+  return (CORBA_long) atk_hyperlink_get_end_index (ATK_HYPERLINK(link->hyperlink));
 }
 
 
@@ -186,10 +157,10 @@ static CORBA_string
 impl_getURI (PortableServer_Servant _servant,
   const CORBA_long i, CORBA_Environment * ev)
 {
-  Hyperlink *link = HYPERLINK(bonobo_object_from_servant(_servant));
+  SpiHyperlink *link = SPI_HYPERLINK(bonobo_object_from_servant(_servant));
   gchar *uri;
   CORBA_char *rv;
-  uri = atk_hyperlink_get_uri (ATK_HYPERLINK(link->atko), (gint) i);
+  uri = atk_hyperlink_get_uri (ATK_HYPERLINK(link->hyperlink), (gint) i);
   if (uri)
     {
       rv = CORBA_string_dup (uri);
@@ -207,11 +178,11 @@ impl_getObject (PortableServer_Servant _servant,
                const CORBA_long i,
                CORBA_Environment * ev)
 {
-  Hyperlink *link = HYPERLINK(bonobo_object_from_servant(_servant));
+  SpiHyperlink *link = SPI_HYPERLINK(bonobo_object_from_servant(_servant));
   AtkObject *atk_object;
   Accessibility_Accessible rv;
-  atk_object = atk_hyperlink_get_object (ATK_HYPERLINK(link->atko), (gint) i);
-  rv = bonobo_object_corba_objref (BONOBO_OBJECT(accessible_new(atk_object)));
+  atk_object = atk_hyperlink_get_object (ATK_HYPERLINK(link->hyperlink), (gint) i);
+  rv = bonobo_object_corba_objref (BONOBO_OBJECT(spi_accessible_new(atk_object)));
   return rv;
 }
 
@@ -221,8 +192,8 @@ static CORBA_boolean
 impl_isValid (PortableServer_Servant _servant,
              CORBA_Environment * ev)
 {
-  Hyperlink *link = HYPERLINK(bonobo_object_from_servant(_servant));
-  return (CORBA_boolean) atk_hyperlink_is_valid (ATK_HYPERLINK(link->atko));
+  SpiHyperlink *link = SPI_HYPERLINK(bonobo_object_from_servant(_servant));
+  return (CORBA_boolean) atk_hyperlink_is_valid (ATK_HYPERLINK(link->hyperlink));
 }