2009-07-06 Mark Doffman <mark.doffman@codethink.co.uk>

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

diff --git a/atk-adaptor/editabletext-adaptor.c b/atk-adaptor/editabletext-adaptor.c
index 76a8866..d088154 100644 (file)
--- a/atk-adaptor/editabletext-adaptor.c
+++ b/atk-adaptor/editabletext-adaptor.c
@@ -25,11 +25,11 @@
 #include <atk/atk.h>
 #include <droute/droute.h>
 
-#include "spi-common/spi-dbus.h"
+#include "common/spi-dbus.h"
 
 static DBusMessage *
 impl_setTextContents (DBusConnection * bus, DBusMessage * message,
-                     void *user_data)
+                      void *user_data)
 {
   AtkEditableText *editable = (AtkEditableText *) user_data;
   const char *newContents;
@@ -43,7 +43,7 @@ impl_setTextContents (DBusConnection * bus, DBusMessage * message,
   if (!dbus_message_get_args
       (message, &error, DBUS_TYPE_STRING, &newContents, DBUS_TYPE_INVALID))
     {
-      return SPI_DBUS_RETURN_ERROR (message, &error);
+      return droute_invalid_arguments_error (message);
     }
   atk_editable_text_set_text_contents (editable, newContents);
   rv = TRUE;
@@ -52,7 +52,7 @@ impl_setTextContents (DBusConnection * bus, DBusMessage * message,
   if (reply)
     {
       dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &rv,
-                               DBUS_TYPE_INVALID);
+                                DBUS_TYPE_INVALID);
     }
   return reply;
 }
@@ -75,7 +75,7 @@ impl_insertText (DBusConnection * bus, DBusMessage * message, void *user_data)
       (message, &error, DBUS_TYPE_INT32, &position, DBUS_TYPE_STRING, &text,
        DBUS_TYPE_INT32, &length, DBUS_TYPE_INVALID))
     {
-      return SPI_DBUS_RETURN_ERROR (message, &error);
+      return droute_invalid_arguments_error (message);
     }
   ip = position;
   atk_editable_text_insert_text (editable, text, length, &ip);
@@ -85,38 +85,7 @@ impl_insertText (DBusConnection * bus, DBusMessage * message, void *user_data)
   if (reply)
     {
       dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &rv,
-                               DBUS_TYPE_INVALID);
-    }
-  return reply;
-}
-
-static DBusMessage *
-impl_setAttributes (DBusConnection * bus, DBusMessage * message,
-                   void *user_data)
-{
-  AtkEditableText *editable = (AtkEditableText *) user_data;
-  const char *attributes;
-  dbus_int32_t startPos, endPos;
-  dbus_bool_t rv;
-  DBusError error;
-  DBusMessage *reply;
-
-  g_return_val_if_fail (ATK_IS_EDITABLE_TEXT (user_data),
-                        droute_not_yet_handled_error (message));
-  dbus_error_init (&error);
-  if (!dbus_message_get_args
-      (message, &error, DBUS_TYPE_STRING, &attributes, DBUS_TYPE_INT32,
-       &startPos, DBUS_TYPE_INT32, &endPos, DBUS_TYPE_INVALID))
-    {
-      return SPI_DBUS_RETURN_ERROR (message, &error);
-    }
-  // TODO implement
-  rv = FALSE;
-  reply = dbus_message_new_method_return (message);
-  if (reply)
-    {
-      dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &rv,
-                               DBUS_TYPE_INVALID);
+                                DBUS_TYPE_INVALID);
     }
   return reply;
 }
@@ -135,10 +104,10 @@ impl_copyText (DBusConnection * bus, DBusMessage * message, void *user_data)
       (message, &error, DBUS_TYPE_INT32, &startPos, DBUS_TYPE_INT32, &endPos,
        DBUS_TYPE_INVALID))
     {
-      return SPI_DBUS_RETURN_ERROR (message, &error);
+      return droute_invalid_arguments_error (message);
     }
   atk_editable_text_copy_text (editable, startPos, endPos);
-  return NULL;
+  return dbus_message_new_method_return (message);
 }
 
 static DBusMessage *
@@ -157,7 +126,7 @@ impl_cutText (DBusConnection * bus, DBusMessage * message, void *user_data)
       (message, &error, DBUS_TYPE_INT32, &startPos, DBUS_TYPE_INT32, &endPos,
        DBUS_TYPE_INVALID))
     {
-      return SPI_DBUS_RETURN_ERROR (message, &error);
+      return droute_invalid_arguments_error (message);
     }
   atk_editable_text_cut_text (editable, startPos, endPos);
   rv = TRUE;
@@ -166,7 +135,7 @@ impl_cutText (DBusConnection * bus, DBusMessage * message, void *user_data)
   if (reply)
     {
       dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &rv,
-                               DBUS_TYPE_INVALID);
+                                DBUS_TYPE_INVALID);
     }
   return reply;
 }
@@ -187,7 +156,7 @@ impl_deleteText (DBusConnection * bus, DBusMessage * message, void *user_data)
       (message, &error, DBUS_TYPE_INT32, &startPos, DBUS_TYPE_INT32, &endPos,
        DBUS_TYPE_INVALID))
     {
-      return SPI_DBUS_RETURN_ERROR (message, &error);
+      return droute_invalid_arguments_error (message);
     }
   atk_editable_text_delete_text (editable, startPos, endPos);
   rv = TRUE;
@@ -196,7 +165,7 @@ impl_deleteText (DBusConnection * bus, DBusMessage * message, void *user_data)
   if (reply)
     {
       dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &rv,
-                               DBUS_TYPE_INVALID);
+                                DBUS_TYPE_INVALID);
     }
   return reply;
 }
@@ -216,7 +185,7 @@ impl_pasteText (DBusConnection * bus, DBusMessage * message, void *user_data)
   if (!dbus_message_get_args
       (message, &error, DBUS_TYPE_INT32, &position, DBUS_TYPE_INVALID))
     {
-      return SPI_DBUS_RETURN_ERROR (message, &error);
+      return droute_invalid_arguments_error (message);
     }
   atk_editable_text_paste_text (editable, position);
   rv = TRUE;
@@ -225,7 +194,7 @@ impl_pasteText (DBusConnection * bus, DBusMessage * message, void *user_data)
   if (reply)
     {
       dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &rv,
-                               DBUS_TYPE_INVALID);
+                                DBUS_TYPE_INVALID);
     }
   return reply;
 }
@@ -233,7 +202,6 @@ impl_pasteText (DBusConnection * bus, DBusMessage * message, void *user_data)
 static DRouteMethod methods[] = {
   {impl_setTextContents, "setTextContents"},
   {impl_insertText, "insertText"},
-  {impl_setAttributes, "setAttributes"},
   {impl_copyText, "copyText"},
   {impl_cutText, "cutText"},
   {impl_deleteText, "deleteText"},