Started fixing IDL docs.

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

diff --git a/libspi/hyperlink.c b/libspi/hyperlink.c
index a858742..eb31975 100644 (file)
--- a/libspi/hyperlink.c
+++ b/libspi/hyperlink.c
@@ -20,28 +20,14 @@
  * Boston, MA 02111-1307, USA.
  */
 
-/*
- * component.c : bonobo wrapper for accessible component implementation
- *
- */
-#include <config.h>
-#include <bonobo/Bonobo.h>
+/* hyperlink.c : implements the Hyperlink interface */
 
+#include <config.h>
 #include <stdio.h>
+#include <libspi/hyperlink.h>
+#include <libspi/accessible.h>
 
-/*
- * This pulls the CORBA definitions for the "Accessibility::Accessible" server
- */
-#include <libspi/Accessibility.h>
-
-/*
- * This pulls the definition of the hyperlink bonobo object
- */
-#include "hyperlink.h"
-
-/*
- * Static function declarations
- */
+/* Static function declarations */
 
 static void
 spi_hyperlink_class_init (SpiHyperlinkClass *klass);
@@ -71,41 +57,11 @@ impl_isValid (PortableServer_Servant _servant,
 
 static GObjectClass *parent_class;
 
-GType
-spi_hyperlink_get_type (void)
-{
-  static GType type = 0;
-
-  if (!type) {
-    static const GTypeInfo tinfo = {
-      sizeof (SpiHyperlinkClass),
-      (GBaseInitFunc) NULL,
-      (GBaseFinalizeFunc) NULL,
-      (GClassInitFunc) spi_hyperlink_class_init,
-      (GClassFinalizeFunc) NULL,
-      NULL, /* class data */
-      sizeof (SpiHyperlink),
-      0, /* n preallocs */
-      (GInstanceInitFunc) spi_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 (SpiHyperlinkClass, epv),
-                              &tinfo,
-                              "SpiAccessibleHyperlink");
-  }
-
-  return type;
-}
+
+BONOBO_TYPE_FUNC_FULL (SpiHyperlink,
+                      Accessibility_Hyperlink,
+                      BONOBO_TYPE_OBJECT,
+                      spi_hyperlink);
 
 static void
 spi_hyperlink_class_init (SpiHyperlinkClass *klass)
@@ -135,18 +91,18 @@ static void
 spi_hyperlink_finalize (GObject *obj)
 {
   SpiHyperlink *hyperlink = SPI_HYPERLINK(obj);
-  g_object_unref (hyperlink->atko);
-  hyperlink->atko = NULL;
+  g_object_unref (hyperlink->hyperlink);
+  hyperlink->hyperlink = NULL;
   parent_class->finalize (obj);
 }
 
 SpiHyperlink *
-spi_hyperlink_interface_new (AtkObject *obj)
+spi_hyperlink_new (AtkHyperlink *hyperlink)
 {
-  SpiHyperlink *new_hyperlink = 
-    SPI_HYPERLINK(g_object_new (SPI_HYPERLINK_TYPE, NULL));
-  new_hyperlink->atko = obj;
-  g_object_ref (obj);
+  SpiHyperlink *new_hyperlink = g_object_new (
+         SPI_HYPERLINK_TYPE, NULL);
+  g_object_ref (hyperlink);
+  new_hyperlink->hyperlink = hyperlink;
   return new_hyperlink;
 }
 
@@ -157,7 +113,7 @@ impl__get_n_anchors (PortableServer_Servant _servant,
                     CORBA_Environment * ev)
 {
   SpiHyperlink *link = SPI_HYPERLINK(bonobo_object_from_servant(_servant));
-  return (CORBA_short) atk_hyperlink_get_n_anchors (ATK_HYPERLINK(link->atko));
+  return (CORBA_short) atk_hyperlink_get_n_anchors (ATK_HYPERLINK(link->hyperlink));
 }
 
 
@@ -167,7 +123,7 @@ impl__get_startIndex (PortableServer_Servant _servant,
                      CORBA_Environment * ev)
 {
   SpiHyperlink *link = SPI_HYPERLINK(bonobo_object_from_servant(_servant));
-  return (CORBA_long) atk_hyperlink_get_start_index (ATK_HYPERLINK(link->atko));
+  return (CORBA_long) atk_hyperlink_get_start_index (ATK_HYPERLINK(link->hyperlink));
 }
 
 
@@ -177,7 +133,7 @@ impl__get_endIndex (PortableServer_Servant _servant,
                    CORBA_Environment * ev)
 {
   SpiHyperlink *link = SPI_HYPERLINK(bonobo_object_from_servant(_servant));
-  return (CORBA_long) atk_hyperlink_get_end_index (ATK_HYPERLINK(link->atko));
+  return (CORBA_long) atk_hyperlink_get_end_index (ATK_HYPERLINK(link->hyperlink));
 }
 
 
@@ -189,7 +145,7 @@ impl_getURI (PortableServer_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);
@@ -210,7 +166,7 @@ impl_getObject (PortableServer_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);
+  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;
 }
@@ -222,7 +178,5 @@ impl_isValid (PortableServer_Servant _servant,
              CORBA_Environment * ev)
 {
   SpiHyperlink *link = SPI_HYPERLINK(bonobo_object_from_servant(_servant));
-  return (CORBA_boolean) atk_hyperlink_is_valid (ATK_HYPERLINK(link->atko));
+  return (CORBA_boolean) atk_hyperlink_is_valid (ATK_HYPERLINK(link->hyperlink));
 }
-
-