projects
/
platform
/
core
/
uifw
/
at-spi2-atk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
BGO#650286: Ensure valid UTF-8 from ATK
[platform/core/uifw/at-spi2-atk.git]
/
atk-adaptor
/
adaptors
/
hyperlink-adaptor.c
diff --git
a/atk-adaptor/adaptors/hyperlink-adaptor.c
b/atk-adaptor/adaptors/hyperlink-adaptor.c
index
732ab2b
..
cd0a924
100644
(file)
--- a/
atk-adaptor/adaptors/hyperlink-adaptor.c
+++ b/
atk-adaptor/adaptors/hyperlink-adaptor.c
@@
-26,6
+26,7
@@
#include <droute/droute.h>
#include "common/spi-dbus.h"
#include <droute/droute.h>
#include "common/spi-dbus.h"
+#include "introspection.h"
#include "object.h"
static AtkHyperlink *
#include "object.h"
static AtkHyperlink *
@@
-42,7
+43,7
@@
static dbus_bool_t
impl_get_NAnchors (DBusMessageIter * iter, void *user_data)
{
AtkHyperlink *link = (AtkHyperlink *) user_data;
impl_get_NAnchors (DBusMessageIter * iter, void *user_data)
{
AtkHyperlink *link = (AtkHyperlink *) user_data;
- g_return_val_if_fail (ATK_IS_HYPERLINK (
user_data
), FALSE);
+ g_return_val_if_fail (ATK_IS_HYPERLINK (
link
), FALSE);
return droute_return_v_int32 (iter, atk_hyperlink_get_n_anchors (link));
}
return droute_return_v_int32 (iter, atk_hyperlink_get_n_anchors (link));
}
@@
-51,7
+52,7
@@
static dbus_bool_t
impl_get_StartIndex (DBusMessageIter * iter, void *user_data)
{
AtkHyperlink *link = get_hyperlink (user_data);
impl_get_StartIndex (DBusMessageIter * iter, void *user_data)
{
AtkHyperlink *link = get_hyperlink (user_data);
- g_return_val_if_fail (ATK_IS_HYPERLINK (
user_data
), FALSE);
+ g_return_val_if_fail (ATK_IS_HYPERLINK (
link
), FALSE);
return droute_return_v_int32 (iter, atk_hyperlink_get_start_index (link));
}
return droute_return_v_int32 (iter, atk_hyperlink_get_start_index (link));
}
@@
-59,7
+60,7
@@
static dbus_bool_t
impl_get_EndIndex (DBusMessageIter * iter, void *user_data)
{
AtkHyperlink *link = get_hyperlink (user_data);
impl_get_EndIndex (DBusMessageIter * iter, void *user_data)
{
AtkHyperlink *link = get_hyperlink (user_data);
- g_return_val_if_fail (ATK_IS_HYPERLINK (
user_data
), FALSE);
+ g_return_val_if_fail (ATK_IS_HYPERLINK (
link
), FALSE);
return droute_return_v_int32 (iter, atk_hyperlink_get_end_index (link));
}
return droute_return_v_int32 (iter, atk_hyperlink_get_end_index (link));
}
@@
-71,7
+72,7
@@
impl_GetObject (DBusConnection * bus, DBusMessage * message, void *user_data)
dbus_int32_t i;
AtkObject *atk_object;
dbus_int32_t i;
AtkObject *atk_object;
- g_return_val_if_fail (ATK_IS_HYPERLINK (
user_data
),
+ g_return_val_if_fail (ATK_IS_HYPERLINK (
link
),
droute_not_yet_handled_error (message));
dbus_error_init (&error);
if (!dbus_message_get_args
droute_not_yet_handled_error (message));
dbus_error_init (&error);
if (!dbus_message_get_args
@@
-92,7
+93,7
@@
impl_GetURI (DBusConnection * bus, DBusMessage * message, void *user_data)
gchar *rv;
DBusMessage *reply;
gchar *rv;
DBusMessage *reply;
- g_return_val_if_fail (ATK_IS_HYPERLINK (
user_data
),
+ g_return_val_if_fail (ATK_IS_HYPERLINK (
link
),
droute_not_yet_handled_error (message));
dbus_error_init (&error);
if (!dbus_message_get_args
droute_not_yet_handled_error (message));
dbus_error_init (&error);
if (!dbus_message_get_args
@@
-121,7
+122,7
@@
impl_IsValid (DBusConnection * bus, DBusMessage * message, void *user_data)
dbus_bool_t rv;
DBusMessage *reply;
dbus_bool_t rv;
DBusMessage *reply;
- g_return_val_if_fail (ATK_IS_HYPERLINK (
user_data
),
+ g_return_val_if_fail (ATK_IS_HYPERLINK (
link
),
droute_not_yet_handled_error (message));
rv = atk_hyperlink_is_valid (link);
droute_not_yet_handled_error (message));
rv = atk_hyperlink_is_valid (link);
@@
-153,5
+154,6
@@
spi_initialize_hyperlink (DRoutePath * path)
{
droute_path_add_interface (path,
SPI_DBUS_INTERFACE_HYPERLINK,
{
droute_path_add_interface (path,
SPI_DBUS_INTERFACE_HYPERLINK,
+ spi_org_a11y_atspi_Hyperlink,
methods, properties);
};
methods, properties);
};