Add value_text to AtspiAccessibleReadingMaterial

This field contains the value of the org.a11y.atspi.Value.Text property.

Change-Id: I1bbcb2b391473078e8a14daf992f4d39dce79f05

diff --git a/atspi/atspi-accessible.c b/atspi/atspi-accessible.c
index 30b4c2b..fa3d8f1 100644 (file)
--- a/atspi/atspi-accessible.c
+++ b/atspi/atspi-accessible.c
@@ -543,7 +543,7 @@ atspi_accessible_get_reading_material (AtspiAccessible *obj, GError **error)
 
   reply = _atspi_dbus_call_partial (obj, atspi_interface_accessible, "GetReadingMaterial", error, "");
 
-  _ATSPI_DBUS_CHECK_SIG (reply, "a{ss}sssuausiddddsibbii(so)auiui(so)", NULL, NULL);
+  _ATSPI_DBUS_CHECK_SIG (reply, "a{ss}sssuausidsdddsibbii(so)auiui(so)", NULL, NULL);
 
   reading_material = calloc(1, sizeof(AtspiAccessibleReadingMaterial));
   if (!reading_material)
@@ -600,6 +600,11 @@ atspi_accessible_get_reading_material (AtspiAccessible *obj, GError **error)
   reading_material->value = current_value;
   dbus_message_iter_next (&iter);
 
+  /* get current formatted value */
+  dbus_message_iter_get_basic (&iter, &name);
+  reading_material->value_text = g_strdup (name);
+  dbus_message_iter_next (&iter);
+
   /* get minimum increment */
   dbus_message_iter_get_basic (&iter, &current_value);
   reading_material->increment = current_value;

diff --git a/atspi/atspi-accessible.h b/atspi/atspi-accessible.h
index 28b8881..058ae2c 100644 (file)
--- a/atspi/atspi-accessible.h
+++ b/atspi/atspi-accessible.h
@@ -64,6 +64,7 @@ struct _AtspiAccessibleReadingMaterial
   char *text_interface_name;
   char *localized_role_name;
   char *description;
+  char *value_text;
   gdouble value;
   gdouble increment;
   gdouble lower;