Started fixing IDL docs.

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

diff --git a/libspi/value.c b/libspi/value.c
index 3549658..e9cdb09 100644 (file)
--- a/libspi/value.c
+++ b/libspi/value.c
@@ -20,35 +20,19 @@
  * Boston, MA 02111-1307, USA.
  */
 
-/*
- * component.c : bonobo wrapper for accessible component implementation
- *
- */
+/* value.c : implements the Value interface */
 #include <config.h>
-#include <bonobo/Bonobo.h>
-
 #include <stdio.h>
+#include <libspi/value.h>
 
-/*
- * This pulls the CORBA definitions for the "Accessibility::Accessible" server
- */
-#include <libspi/Accessibility.h>
-
-/*
- * This pulls the definition of the Value bonobo object
- */
-#include "value.h"
-
-/*
- * Static function declarations
- */
+/* Static function declarations */
 
 static void
-value_class_init (ValueClass *klass);
+spi_value_class_init (SpiValueClass *klass);
 static void
-value_init (Value *value);
+spi_value_init (SpiValue *value);
 static void
-value_finalize (GObject *obj);
+spi_value_finalize (GObject *obj);
 static CORBA_float
 impl__get_minimumValue (PortableServer_Servant _servant,
                        CORBA_Environment * ev);
@@ -68,50 +52,19 @@ impl__set_currentValue (PortableServer_Servant _servant,
 static GObjectClass *parent_class;
 
 
-GType
-value_get_type (void)
-{
-  static GType type = 0;
-
-  if (!type) {
-    static const GTypeInfo tinfo = {
-      sizeof (ValueClass),
-      (GBaseInitFunc) NULL,
-      (GBaseFinalizeFunc) NULL,
-      (GClassInitFunc) value_class_init,
-      (GClassFinalizeFunc) NULL,
-      NULL, /* class data */
-      sizeof (Value),
-      0, /* n preallocs */
-      (GInstanceInitFunc) value_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_Value__init,
-                              NULL,
-                              G_STRUCT_OFFSET (ValueClass, epv),
-                              &tinfo,
-                              "AccessibleValue");
-  }
-
-  return type;
-}
+BONOBO_TYPE_FUNC_FULL (SpiValue,
+                      Accessibility_Value,
+                      BONOBO_TYPE_OBJECT,
+                      spi_value);
 
 static void
-value_class_init (ValueClass *klass)
+spi_value_class_init (SpiValueClass *klass)
 {
   GObjectClass * object_class = (GObjectClass *) klass;
   POA_Accessibility_Value__epv *epv = &klass->epv;
   parent_class = g_type_class_peek_parent (klass);
 
-  object_class->finalize = value_finalize;
+  object_class->finalize = spi_value_finalize;
 
 
   /* Initialize epv table */
@@ -123,24 +76,23 @@ value_class_init (ValueClass *klass)
 }
 
 static void
-value_init (Value *value)
+spi_value_init (SpiValue *value)
 {
 }
 
 static void
-value_finalize (GObject *obj)
+spi_value_finalize (GObject *obj)
 {
-  Value *value = VALUE (obj);
+  SpiValue *value = SPI_VALUE (obj);
   g_object_unref (value->atko);
   value->atko = NULL;
   parent_class->finalize (obj);
 }
 
-Value *
-value_interface_new (AtkObject *obj)
+SpiValue *
+spi_value_interface_new (AtkObject *obj)
 {
-  Value *new_value = 
-    VALUE(g_object_new (VALUE_TYPE, NULL));
+  SpiValue *new_value = g_object_new (SPI_VALUE_TYPE, NULL);
   new_value->atko = obj;
   g_object_ref (obj);
   return new_value;
@@ -152,7 +104,7 @@ static CORBA_float
 impl__get_minimumValue (PortableServer_Servant _servant,
                       CORBA_Environment * ev)
 {
-  Value *value = VALUE (bonobo_object_from_servant (_servant));
+  SpiValue *value = SPI_VALUE (bonobo_object_from_servant (_servant));
   GValue gvalue = {0, };
 
   g_value_init (&gvalue, G_TYPE_FLOAT);
@@ -166,7 +118,7 @@ static        CORBA_float
 impl__get_maximumValue (PortableServer_Servant _servant,
                        CORBA_Environment * ev)
 {
-  Value *value = VALUE (bonobo_object_from_servant (_servant));
+  SpiValue *value = SPI_VALUE (bonobo_object_from_servant (_servant));
   GValue gvalue = {0, };
 
   g_value_init (&gvalue, G_TYPE_FLOAT);
@@ -180,7 +132,7 @@ static CORBA_float
 impl__get_currentValue (PortableServer_Servant _servant,
                        CORBA_Environment * ev)
 {
-  Value *value = VALUE (bonobo_object_from_servant (_servant));
+  SpiValue *value = SPI_VALUE (bonobo_object_from_servant (_servant));
   GValue gvalue = {0, };
 
   g_value_init (&gvalue, G_TYPE_FLOAT);
@@ -194,7 +146,7 @@ impl__set_currentValue (PortableServer_Servant _servant,
                        const CORBA_float value,
                        CORBA_Environment * ev)
 {
-  Value *val = VALUE (bonobo_object_from_servant (_servant));
+  SpiValue *val = SPI_VALUE (bonobo_object_from_servant (_servant));
   GValue gvalue = {0, };
 
   g_value_init (&gvalue, G_TYPE_FLOAT);