Post-release version bump

[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 4853848..e397e1f 100644 (file)
--- a/atk-adaptor/adaptors/hyperlink-adaptor.c
+++ b/atk-adaptor/adaptors/hyperlink-adaptor.c
@@ -25,7 +25,7 @@
 #include <atk/atk.h>
 #include <droute/droute.h>
 
-#include "common/spi-dbus.h"
+#include "spi-dbus.h"
 #include "introspection.h"
 #include "object.h"
 
@@ -42,8 +42,8 @@ get_hyperlink (void *user_data)
 static dbus_bool_t
 impl_get_NAnchors (DBusMessageIter * iter, void *user_data)
 {
-  AtkHyperlink *link = (AtkHyperlink *) user_data;
-  g_return_val_if_fail (ATK_IS_HYPERLINK (user_data), FALSE);
+  AtkHyperlink *link = get_hyperlink (user_data);
+  g_return_val_if_fail (ATK_IS_HYPERLINK (link), FALSE);
   return droute_return_v_int32 (iter, atk_hyperlink_get_n_anchors (link));
 }
 
@@ -52,7 +52,7 @@ static dbus_bool_t
 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));
 }
 
@@ -60,7 +60,7 @@ static dbus_bool_t
 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));
 }
 
@@ -68,15 +68,13 @@ static DBusMessage *
 impl_GetObject (DBusConnection * bus, DBusMessage * message, void *user_data)
 {
   AtkHyperlink *link = get_hyperlink (user_data);
-  DBusError error;
   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
-      (message, &error, DBUS_TYPE_INT32, &i, DBUS_TYPE_INVALID))
+      (message, NULL, DBUS_TYPE_INT32, &i, DBUS_TYPE_INVALID))
     {
       return droute_invalid_arguments_error (message);
     }
@@ -89,15 +87,13 @@ impl_GetURI (DBusConnection * bus, DBusMessage * message, void *user_data)
 {
   AtkHyperlink *link = get_hyperlink (user_data);
   dbus_int32_t i;
-  DBusError error;
   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
-      (message, &error, DBUS_TYPE_INT32, &i, DBUS_TYPE_INVALID))
+      (message, NULL, DBUS_TYPE_INT32, &i, DBUS_TYPE_INVALID))
     {
       return droute_invalid_arguments_error (message);
     }
@@ -122,7 +118,7 @@ impl_IsValid (DBusConnection * bus, DBusMessage * message, void *user_data)
   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);
@@ -153,7 +149,7 @@ void
 spi_initialize_hyperlink (DRoutePath * path)
 {
   droute_path_add_interface (path,
-                             SPI_DBUS_INTERFACE_HYPERLINK,
+                             ATSPI_DBUS_INTERFACE_HYPERLINK,
                              spi_org_a11y_atspi_Hyperlink,
                              methods, properties);
 };