Use libatspi to get the accessibility bus and handle main loop integration

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

diff --git a/atk-adaptor/adaptors/value-adaptor.c b/atk-adaptor/adaptors/value-adaptor.c
index 833543c..b3bc550 100644 (file)
--- a/atk-adaptor/adaptors/value-adaptor.c
+++ b/atk-adaptor/adaptors/value-adaptor.c
@@ -28,6 +28,7 @@
 #include <droute/droute.h>
 
 #include "common/spi-dbus.h"
+#include "introspection.h"
 
 static dbus_bool_t
 impl_get_MinimumValue (DBusMessageIter * iter, void *user_data)
@@ -59,7 +60,7 @@ impl_get_MaximumValue (DBusMessageIter * iter, void *user_data)
   AtkValue *value = (AtkValue *) user_data;
   GValue src = { 0 };
   GValue dest = { 0 };
-  gdouble dub;
+  gdouble dub = 0;
 
   g_return_val_if_fail (ATK_IS_VALUE (user_data), FALSE);
 
@@ -69,12 +70,8 @@ impl_get_MaximumValue (DBusMessageIter * iter, void *user_data)
   if (g_value_transform (&src, &dest))
     {
       dub = g_value_get_double (&dest);
-      return droute_return_v_double (iter, dub);
-    }
-  else
-    {
-      return FALSE;
     }
+  return droute_return_v_double (iter, dub);
 }
 
 static dbus_bool_t
@@ -83,7 +80,7 @@ impl_get_MinimumIncrement (DBusMessageIter * iter, void *user_data)
   AtkValue *value = (AtkValue *) user_data;
   GValue src = { 0 };
   GValue dest = { 0 };
-  gdouble dub;
+  gdouble dub = 0;
 
   g_return_val_if_fail (ATK_IS_VALUE (user_data), FALSE);
 
@@ -93,12 +90,8 @@ impl_get_MinimumIncrement (DBusMessageIter * iter, void *user_data)
   if (g_value_transform (&src, &dest))
     {
       dub = g_value_get_double (&dest);
-      return droute_return_v_double (iter, dub);
-    }
-  else
-    {
-      return FALSE;
     }
+  return droute_return_v_double (iter, dub);
 }
 
 static dbus_bool_t
@@ -107,7 +100,7 @@ impl_get_CurrentValue (DBusMessageIter * iter, void *user_data)
   AtkValue *value = (AtkValue *) user_data;
   GValue src = { 0 };
   GValue dest = { 0 };
-  gdouble dub;
+  gdouble dub = 0;
 
   g_return_val_if_fail (ATK_IS_VALUE (user_data), FALSE);
 
@@ -117,12 +110,8 @@ impl_get_CurrentValue (DBusMessageIter * iter, void *user_data)
   if (g_value_transform (&src, &dest))
     {
       dub = g_value_get_double (&dest);
-      return droute_return_v_double (iter, dub);
-    }
-  else
-    {
-      return FALSE;
     }
+  return droute_return_v_double (iter, dub);
 }
 
 static dbus_bool_t
@@ -171,5 +160,5 @@ void
 spi_initialize_value (DRoutePath * path)
 {
   droute_path_add_interface (path,
-                             SPI_DBUS_INTERFACE_VALUE, NULL, properties);
+                             SPI_DBUS_INTERFACE_VALUE, spi_org_a11y_atspi_Value, NULL, properties);
 };