Add member of default label info that check for default label enabed

Change-Id: Iada1ee38ed7f1c2b0239dd96f58ae3850af6d9e9

diff --git a/atspi/atspi-accessible.c b/atspi/atspi-accessible.c
index 6612a21..600dc82 100644 (file)
--- a/atspi/atspi-accessible.c
+++ b/atspi/atspi-accessible.c
@@ -577,6 +577,7 @@ atspi_accessible_get_reading_material (AtspiAccessible *obj, GError **error)
  * You have to handle all alocated memory as below on screen-reader side.
  *
  * AtspiAccessibleDefaultLabelInfo *dli
+ * g_hash_table_unref(dli->attributes);
  * g_object_unref(dli->obj);
  * free(dli);
  **/
@@ -593,7 +594,7 @@ atspi_accessible_get_default_label_info (AtspiAccessible *obj, GError **error)
 
   reply = _atspi_dbus_call_partial (obj, atspi_interface_accessible, "GetDefaultLabelInfo", error, "");
 
-  _ATSPI_DBUS_CHECK_SIG (reply, "(so)u", NULL, NULL);
+  _ATSPI_DBUS_CHECK_SIG (reply, "(so)ua{ss}", NULL, NULL);
 
   default_label_info = calloc(1, sizeof(AtspiAccessibleDefaultLabelInfo));
   if (!default_label_info)
@@ -610,6 +611,9 @@ atspi_accessible_get_default_label_info (AtspiAccessible *obj, GError **error)
   default_label_info->role = role;
   dbus_message_iter_next (&iter);
 
+  default_label_info->attributes =  _atspi_dbus_hash_from_iter (&iter);
+  dbus_message_iter_next (&iter);
+
   return default_label_info;
 }
 

diff --git a/atspi/atspi-accessible.h b/atspi/atspi-accessible.h
index 9efc168..2b7046e 100644 (file)
--- a/atspi/atspi-accessible.h
+++ b/atspi/atspi-accessible.h
@@ -49,6 +49,7 @@ struct _AtspiAccessibleDefaultLabelInfo
 {
   AtspiAccessible *obj;
   AtspiRole role;
+  GHashTable *attributes;
 };
 
 struct _AtspiAccessibleReadingMaterial