Fixed bug in Accessible_getDescription().

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

diff --git a/libspi/value.c b/libspi/value.c
index 5d23c7a..9610701 100644 (file)
--- a/libspi/value.c
+++ b/libspi/value.c
@@ -35,7 +35,7 @@
 #include <libspi/Accessibility.h>
 
 /*
- * This pulls the definition of the Value bonobo object
+ * This pulls the definition of the SpiValue bonobo object
  */
 #include "value.h"
 
@@ -44,11 +44,11 @@
  */
 
 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);
@@ -69,21 +69,21 @@ static GObjectClass *parent_class;
 
 
 GType
-value_get_type (void)
+spi_value_get_type (void)
 {
   static GType type = 0;
 
   if (!type) {
     static const GTypeInfo tinfo = {
-      sizeof (ValueClass),
+      sizeof (SpiValueClass),
       (GBaseInitFunc) NULL,
       (GBaseFinalizeFunc) NULL,
-      (GClassInitFunc) value_class_init,
+      (GClassInitFunc) spi_value_class_init,
       (GClassFinalizeFunc) NULL,
       NULL, /* class data */
-      sizeof (Value),
+      sizeof (SpiValue),
       0, /* n preallocs */
-      (GInstanceInitFunc) value_init,
+      (GInstanceInitFunc) spi_value_init,
                         NULL /* value table */
     };
 
@@ -96,22 +96,22 @@ value_get_type (void)
                               BONOBO_OBJECT_TYPE,
                               POA_Accessibility_Value__init,
                               NULL,
-                              G_STRUCT_OFFSET (ValueClass, epv),
+                              G_STRUCT_OFFSET (SpiValueClass, epv),
                               &tinfo,
-                              "AccessibleValue");
+                              "SpiAccessibleValue");
   }
 
   return type;
 }
 
 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 +123,26 @@ 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);
-  value->atk_value = NULL;
+  SpiValue *value = SPI_VALUE (obj);
+  g_object_unref (value->atko);
+  value->atko = NULL;
   parent_class->finalize (obj);
 }
 
-Value *
-value_new (AtkValue *value)
+SpiValue *
+spi_value_interface_new (AtkObject *obj)
 {
-  Value *new_value = 
-    VALUE(g_object_new (VALUE_TYPE, NULL));
-  new_value->atk_value = value;
+  SpiValue *new_value = 
+    SPI_VALUE(g_object_new (SPI_VALUE_TYPE, NULL));
+  new_value->atko = obj;
+  g_object_ref (obj);
   return new_value;
 }
 
@@ -150,11 +152,11 @@ 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);
-  atk_value_get_minimum_value (value->atk_value, &gvalue);
+  atk_value_get_minimum_value (ATK_VALUE(value->atko), &gvalue);
   return (CORBA_float) g_value_get_float (&gvalue);
 }
 
@@ -164,11 +166,11 @@ 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);
-  atk_value_get_maximum_value (value->atk_value, &gvalue);
+  atk_value_get_maximum_value (ATK_VALUE(value->atko), &gvalue);
   return (CORBA_float) g_value_get_float (&gvalue);
 }
 
@@ -178,11 +180,11 @@ 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);
-  atk_value_get_current_value (value->atk_value, &gvalue);
+  atk_value_get_current_value (ATK_VALUE(value->atko), &gvalue);
   return (CORBA_float) g_value_get_float (&gvalue);
 }
 
@@ -192,12 +194,12 @@ 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);
   g_value_set_float (&gvalue, (gfloat) value);
-  atk_value_set_current_value (val->atk_value, &gvalue);
+  atk_value_set_current_value (ATK_VALUE(val->atko), &gvalue);
 }