Add formatted value to GetReadingMaterial

Change-Id: Ife789b46a8ea319d218e9e4e2ab011f45d8d33e4

diff --git a/atk-adaptor/adaptors/accessible-adaptor.c b/atk-adaptor/adaptors/accessible-adaptor.c
index b17a7bb764f5b0f85cd35f2a8faa2c4ea1a9d316..a88f94ed674cbb233a2905cbd246bc68d96d97b6 100644 (file)
--- a/atk-adaptor/adaptors/accessible-adaptor.c
+++ b/atk-adaptor/adaptors/accessible-adaptor.c
@@ -852,13 +852,18 @@ impl_GetReadingMaterial (DBusConnection * bus, DBusMessage * message, void *user
   /* current value, increment, max, min */
   AtkValue *value = (AtkValue *) object;
   gdouble current_value = 0;
+  char *current_value_text = "";
+  char *current_value_text_free = NULL; // what to free() later
   gdouble increment = 0;
   gdouble min_value = 0;
   gdouble max_value = 0;
   if (ATK_IS_VALUE(value))
   {
-    gchar *desc = NULL;
-    atk_value_get_value_and_text (value, &current_value, &desc);
+    atk_value_get_value_and_text (value, &current_value, &current_value_text);
+    if (current_value_text)
+      current_value_text_free = current_value_text;
+    else
+      current_value_text = "";
 
     increment = atk_value_get_increment (value);
 
@@ -870,10 +875,13 @@ impl_GetReadingMaterial (DBusConnection * bus, DBusMessage * message, void *user
         atk_range_free (range);
       }
   }
+
   dbus_message_iter_append_basic (&iter, DBUS_TYPE_DOUBLE, &current_value);
+  dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &current_value_text);
   dbus_message_iter_append_basic (&iter, DBUS_TYPE_DOUBLE, &increment);
   dbus_message_iter_append_basic (&iter, DBUS_TYPE_DOUBLE, &max_value);
   dbus_message_iter_append_basic (&iter, DBUS_TYPE_DOUBLE, &min_value);
+  free (current_value_text_free);
 
   /* description */
   name = atk_object_get_description (object);

diff --git a/atk-adaptor/introspection.c b/atk-adaptor/introspection.c
index 6709e2ce4f405798c1531f293b4ae2b0d8fd47e5..9428de1567b70bd290f00683223276b1c2cba54d 100644 (file)
--- a/atk-adaptor/introspection.c
+++ b/atk-adaptor/introspection.c
@@ -26,7 +26,7 @@ const char *spi_org_a11y_atspi_Accessible =
 "  <property access=\"read\" name=\"Locale\" type=\"s\" />"
 ""
 "  <method name=\"impl_GetReadingMaterial\">"
-"    <arg direction=\"out\" type=\"a{ss}sssuausiddddsibbii(so)auiui(so)\" />"
+"    <arg direction=\"out\" type=\"a{ss}sssuausidsdddsibbii(so)auiui(so)\" />"
 "  </method>"
 ""
 "  <method name=\"GetChildAtIndex\">"