Removed po directory from Makefile.am for now.

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

diff --git a/libspi/relation.c b/libspi/relation.c
index d3877ef..9fb3de5 100644 (file)
--- a/libspi/relation.c
+++ b/libspi/relation.c
@@ -20,128 +20,42 @@
  * Boston, MA 02111-1307, USA.
  */
 
-/*
- * relation.c : bonobo wrapper for accessible relation implementation
- *
- */
-#include <config.h>
-#include <bonobo/Bonobo.h>
+/* relation.c : implements the Relation interface */
 
+#include <config.h>
 #include <stdio.h>
+#include <libspi/relation.h>
 
-/*
- * This pulls the CORBA definitions for the "Accessibility::Accessible" server
- */
-#include <libspi/Accessibility.h>
-
-/*
- * This pulls the definition of the relation bonobo object
- */
-#include "relation.h"
-
-/*
- * Static function declarations
- */
-
-static void
-spi_relation_class_init (SpiRelationClass *klass);
-static void
-spi_relation_init (SpiRelation *relation);
-static void
-spi_relation_finalize (GObject *obj);
-static CORBA_string
-impl_getURI (PortableServer_Servant _servant,
-            const CORBA_long i, CORBA_Environment * ev);
-static CORBA_short
-impl__get_n_anchors (PortableServer_Servant _servant,
-                    CORBA_Environment * ev);
-static CORBA_long
-impl__get_startIndex (PortableServer_Servant _servant,
-                     CORBA_Environment * ev);
-static CORBA_long
-impl__get_endIndex (PortableServer_Servant _servant,
-                   CORBA_Environment * ev);
-static Accessibility_Accessible
-impl_getObject (PortableServer_Servant _servant,
-               const CORBA_long i,
-               CORBA_Environment * ev);
-static CORBA_boolean
-impl_isValid (PortableServer_Servant _servant,
-             CORBA_Environment * ev);
-
-static GObjectClass *parent_class;
 
-GType
-spi_relation_get_type (void)
+SpiRelation *
+spi_relation_new (AtkRelation *obj)
 {
-  static GType type = 0;
+  SpiRelation *new_relation = g_object_new (SPI_RELATION_TYPE, NULL);
 
-  if (!type) {
-    static const GTypeInfo tinfo = {
-      sizeof (SpiRelationClass),
-      (GBaseInitFunc) NULL,
-      (GBaseFinalizeFunc) NULL,
-      (GClassInitFunc) spi_relation_class_init,
-      (GClassFinalizeFunc) NULL,
-      NULL, /* class data */
-      sizeof (SpiRelation),
-      0, /* n preallocs */
-      (GInstanceInitFunc) spi_relation_init,
-                        NULL /* value table */
-    };
+  spi_base_construct (SPI_BASE (new_relation), ATK_OBJECT (obj));
 
-    /*
-     * 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_Relation__init,
-                              NULL,
-                              G_STRUCT_OFFSET (SpiRelationClass, epv),
-                              &tinfo,
-                              "SpiAccessibleRelation");
-  }
-
-  return type;
+  return new_relation;
 }
 
+
 static void
 spi_relation_class_init (SpiRelationClass *klass)
 {
-  GObjectClass * object_class = (GObjectClass *) klass;
   POA_Accessibility_Relation__epv *epv = &klass->epv;
-  parent_class = g_type_class_peek_parent (klass);
-
-  object_class->finalize = spi_relation_finalize;
 
   epv->getRelationType  = NULL; /* TODO: finish me! */
   epv->getNTargets      = NULL;
   epv->getTarget        = NULL;
 }
 
-static void
-spi_relation_init (SpiRelation *relation)
-{
-}
 
 static void
-spi_relation_finalize (GObject *obj)
+spi_relation_init (SpiRelation *relation)
 {
-  SpiRelation *relation = SPI_RELATION(obj);
-  g_object_unref (relation->relation);
-  relation->relation = NULL;
-  parent_class->finalize (obj);
 }
 
-SpiRelation *
-spi_relation_new (AtkRelation *obj)
-{
-  SpiRelation *new_relation = 
-    SPI_RELATION (g_object_new (SPI_RELATION_TYPE, NULL));
-  new_relation->relation = obj;
-  g_object_ref (obj);
-  return new_relation;
-}
 
+BONOBO_TYPE_FUNC_FULL (SpiRelation,
+                      Accessibility_Relation,
+                      SPI_TYPE_BASE,
+                      spi_relation);