diff options
| author | Patryk Kaczmarek <patryk.k@samsung.com> | 2015-09-28 14:23:15 +0200 |
|---|---|---|
| committer | Mike Gorse <mgorse@suse.com> | 2015-10-12 14:20:12 -0500 |
| commit | 703990c0c9b39aa98fa37d07e23af88cf7549388 (patch) | |
| tree | bda5afbb2882b6bd64b305addbeca6a0290b7208 | |
| parent | acbaee062b450517f66bceb9f4787b5dc9463d04 (diff) | |
| download | at-spi2-core-703990c0c9b39aa98fa37d07e23af88cf7549388.tar.gz | |
Fixed atspi_text_ functionsAT_SPI2_CORE_2_18_1
* atspi_text_get_text_attribute_value
Fixed dbus signature in _atspi_dbus_call function
and add missing argument for string.
* atspi_text_get_default_attributes
Receiving return value by reference from hash table
https://bugzilla.gnome.org/show_bug.cgi?id=755731
| -rw-r--r-- | atspi/atspi-text.c | 6 | ||||
| -rw-r--r-- | idl/text.didl | 3 | ||||
| -rw-r--r-- | registryd/introspection.c | 3 | ||||
| -rw-r--r-- | xml/Text.xml | 3 |
4 files changed, 5 insertions, 10 deletions
diff --git a/atspi/atspi-text.c b/atspi/atspi-text.c index 6639fd42..1e887d39 100644 --- a/atspi/atspi-text.c +++ b/atspi/atspi-text.c @@ -319,10 +319,14 @@ atspi_text_get_text_attribute_value (AtspiText *obj, GError **error) { gchar *retval = NULL; + dbus_int32_t d_i = offset; g_return_val_if_fail (obj != NULL, NULL); - _atspi_dbus_call (obj, atspi_interface_text, "GetAttributeValue", error, "i=>s", offset, &retval); + _atspi_dbus_call (obj, atspi_interface_text, "GetAttributeValue", error, "is=>s", d_i, (const gchar *)attribute_value, &retval); + + if (!retval) + retval = g_strdup (""); return retval; } diff --git a/idl/text.didl b/idl/text.didl index 0796dcb9..07ce85e1 100644 --- a/idl/text.didl +++ b/idl/text.didl @@ -110,9 +110,6 @@ namespace org.freestandards.atspi { string attribute_key; } reply { string attribute_value; - int32 start_offset; - int32 end_offset; - boolean defined; } /* Deprecated in favor of GetAttributeRun. */ diff --git a/registryd/introspection.c b/registryd/introspection.c index edcf60d2..5b694add 100644 --- a/registryd/introspection.c +++ b/registryd/introspection.c @@ -556,9 +556,6 @@ const char *spi_org_a11y_atspi_Text = " <arg direction=\"in\" name=\"offset\" type=\"i\" />" " <arg direction=\"in\" name=\"attributeName\" type=\"s\" />" " <arg direction=\"out\" type=\"s\" />" -" <arg direction=\"out\" name=\"startOffset\" type=\"i\" />" -" <arg direction=\"out\" name=\"endOffset\" type=\"i\" />" -" <arg direction=\"out\" name=\"defined\" type=\"b\" />" " </method>" "" " <method name=\"GetAttributes\">" diff --git a/xml/Text.xml b/xml/Text.xml index 7af366ac..320ee5e4 100644 --- a/xml/Text.xml +++ b/xml/Text.xml @@ -58,9 +58,6 @@ <arg direction="in" name="offset" type="i"/> <arg direction="in" name="attributeName" type="s"/> <arg direction="out" type="s"/> - <arg direction="out" name="startOffset" type="i"/> - <arg direction="out" name="endOffset" type="i"/> - <arg direction="out" name="defined" type="b"/> </method> <method name="GetAttributes"> |