Code style enforcement.

[platform/core/uifw/at-spi2-atk.git] / atk-adaptor / hypertext-adaptor.c

diff --git a/atk-adaptor/hypertext-adaptor.c b/atk-adaptor/hypertext-adaptor.c
index 09a6d65..082dde3 100644 (file)
--- a/atk-adaptor/hypertext-adaptor.c
+++ b/atk-adaptor/hypertext-adaptor.c
@@ -25,10 +25,11 @@
 #include <atk/atk.h>
 #include <droute/droute.h>
 
-#include "spi-common/spi-dbus.h"
+#include "common/spi-dbus.h"
+#include "accessible-marshaller.h"
 
 static DBusMessage *
-impl_getNLinks (DBusConnection * bus, DBusMessage * message, void *user_data)
+impl_GetNLinks (DBusConnection * bus, DBusMessage * message, void *user_data)
 {
   AtkHypertext *hypertext = (AtkHypertext *) user_data;
   gint rv;
@@ -47,7 +48,7 @@ impl_getNLinks (DBusConnection * bus, DBusMessage * message, void *user_data)
 }
 
 static DBusMessage *
-impl_getLink (DBusConnection * bus, DBusMessage * message, void *user_data)
+impl_GetLink (DBusConnection * bus, DBusMessage * message, void *user_data)
 {
   AtkHypertext *hypertext = (AtkHypertext *) user_data;
   DBusError error;
@@ -63,12 +64,12 @@ impl_getLink (DBusConnection * bus, DBusMessage * message, void *user_data)
       return droute_invalid_arguments_error (message);
     }
   link = atk_hypertext_get_link (hypertext, linkIndex);
-  return NULL; // TODO
-  //return spi_dbus_return_object (message, ATK_OBJECT (link), FALSE);
+  return spi_dbus_return_hyperlink (message, link, ATK_OBJECT (hypertext),
+                                    TRUE);
 }
 
 static DBusMessage *
-impl_getLinkIndex (DBusConnection * bus, DBusMessage * message,
+impl_GetLinkIndex (DBusConnection * bus, DBusMessage * message,
                    void *user_data)
 {
   AtkHypertext *hypertext = (AtkHypertext *) user_data;
@@ -96,17 +97,15 @@ impl_getLinkIndex (DBusConnection * bus, DBusMessage * message,
 }
 
 static DRouteMethod methods[] = {
-  {impl_getNLinks, "getNLinks"},
-  {impl_getLink, "getLink"},
-  {impl_getLinkIndex, "getLinkIndex"},
+  {impl_GetNLinks, "GetNLinks"},
+  {impl_GetLink, "GetLink"},
+  {impl_GetLinkIndex, "GetLinkIndex"},
   {NULL, NULL}
 };
 
 void
-spi_initialize_hypertext (DRoutePath *path)
+spi_initialize_hypertext (DRoutePath * path)
 {
   droute_path_add_interface (path,
-                             SPI_DBUS_INTERFACE_HYPERTEXT,
-                             methods,
-                             NULL);
+                             SPI_DBUS_INTERFACE_HYPERTEXT, methods, NULL);
 };