X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=atk-adaptor%2Fselection-adaptor.c;h=4516b523bac8e61b56d3c75c8cf025afa9a4011f;hb=e9d9fedb0c914825a3ccd8b390deb52a93800415;hp=c3486558a3ab3e5ae968c8afc1eacd72a3021b1b;hpb=2db1353c28700fa75c8fa11a6d660046c189a151;p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git

diff --git a/atk-adaptor/selection-adaptor.c b/atk-adaptor/selection-adaptor.c
index c348655..4516b52 100644
--- a/atk-adaptor/selection-adaptor.c
+++ b/atk-adaptor/selection-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"
+#include "accessible-marshaller.h"
 
 static dbus_bool_t
-impl_get_nSelectedChildren (DBusMessageIter * iter,
-                            void *user_data)
+impl_get_NSelectedChildren (DBusMessageIter * iter, void *user_data)
 {
   AtkSelection *selection = (AtkSelection *) user_data;
   g_return_val_if_fail (ATK_IS_SELECTION (user_data), FALSE);
@@ -39,16 +39,16 @@ impl_get_nSelectedChildren (DBusMessageIter * iter,
 }
 
 /*static char *
-impl_get_nSelectedChildren_str (void *datum)
+impl_get_NSelectedChildren_str (void *datum)
 {
-  g_assert (ATK_IS_HYPERLINK (datum));
+  g_return_val_if_fail (ATK_IS_SELECTION (user_data), FALSE);
   return g_strdup_printf ("%d",
                           atk_selection_get_selection_count ((AtkSelection *)
                                                              datum));
 }*/
 
 static DBusMessage *
-impl_getSelectedChild (DBusConnection * bus, DBusMessage * message,
+impl_GetSelectedChild (DBusConnection * bus, DBusMessage * message,
                        void *user_data)
 {
   AtkSelection *selection = (AtkSelection *) user_data;
@@ -66,11 +66,11 @@ impl_getSelectedChild (DBusConnection * bus, DBusMessage * message,
       return droute_invalid_arguments_error (message);
     }
   atk_object = atk_selection_ref_selection (selection, selectedChildIndex);
-  return spi_dbus_return_object (message, atk_object, TRUE);
+  return spi_dbus_return_object (message, atk_object, TRUE, TRUE);
 }
 
 static DBusMessage *
-impl_selectChild (DBusConnection * bus, DBusMessage * message,
+impl_SelectChild (DBusConnection * bus, DBusMessage * message,
                   void *user_data)
 {
   AtkSelection *selection = (AtkSelection *) user_data;
@@ -98,7 +98,7 @@ impl_selectChild (DBusConnection * bus, DBusMessage * message,
 }
 
 static DBusMessage *
-impl_deselectSelectedChild (DBusConnection * bus, DBusMessage * message,
+impl_DeselectSelectedChild (DBusConnection * bus, DBusMessage * message,
                             void *user_data)
 {
   AtkSelection *selection = (AtkSelection *) user_data;
@@ -127,7 +127,7 @@ impl_deselectSelectedChild (DBusConnection * bus, DBusMessage * message,
 }
 
 static DBusMessage *
-impl_isChildSelected (DBusConnection * bus, DBusMessage * message,
+impl_IsChildSelected (DBusConnection * bus, DBusMessage * message,
                       void *user_data)
 {
   AtkSelection *selection = (AtkSelection *) user_data;
@@ -155,7 +155,7 @@ impl_isChildSelected (DBusConnection * bus, DBusMessage * message,
 }
 
 static DBusMessage *
-impl_selectAll (DBusConnection * bus, DBusMessage * message, void *user_data)
+impl_SelectAll (DBusConnection * bus, DBusMessage * message, void *user_data)
 {
   AtkSelection *selection = (AtkSelection *) user_data;
   dbus_bool_t rv;
@@ -174,7 +174,7 @@ impl_selectAll (DBusConnection * bus, DBusMessage * message, void *user_data)
 }
 
 static DBusMessage *
-impl_clearSelection (DBusConnection * bus, DBusMessage * message,
+impl_ClearSelection (DBusConnection * bus, DBusMessage * message,
                      void *user_data)
 {
   AtkSelection *selection = (AtkSelection *) user_data;
@@ -194,7 +194,7 @@ impl_clearSelection (DBusConnection * bus, DBusMessage * message,
 }
 
 static DBusMessage *
-impl_deselectChild (DBusConnection * bus, DBusMessage * message,
+impl_DeselectChild (DBusConnection * bus, DBusMessage * message,
                     void *user_data)
 {
   AtkSelection *selection = (AtkSelection *) user_data;
@@ -235,26 +235,25 @@ impl_deselectChild (DBusConnection * bus, DBusMessage * message,
 }
 
 static DRouteMethod methods[] = {
-  {impl_getSelectedChild, "getSelectedChild"},
-  {impl_selectChild, "selectChild"},
-  {impl_deselectSelectedChild, "deselectSelectedChild"},
-  {impl_isChildSelected, "isChildSelected"},
-  {impl_selectAll, "selectAll"},
-  {impl_clearSelection, "clearSelection"},
-  {impl_deselectChild, "deselectChild"},
+  {impl_GetSelectedChild, "GetSelectedChild"},
+  {impl_SelectChild, "SelectChild"},
+  {impl_DeselectSelectedChild, "DeselectSelectedChild"},
+  {impl_IsChildSelected, "IsChildSelected"},
+  {impl_SelectAll, "SelectAll"},
+  {impl_ClearSelection, "ClearSelection"},
+  {impl_DeselectChild, "DeselectChild"},
   {NULL, NULL}
 };
 
 static DRouteProperty properties[] = {
-  {impl_get_nSelectedChildren, NULL, "nSelectedChildren"},
+  {impl_get_NSelectedChildren, NULL, "NSelectedChildren"},
   {NULL, NULL, NULL}
 };
 
 void
-spi_initialize_selection (DRoutePath *path)
+spi_initialize_selection (DRoutePath * path)
 {
   droute_path_add_interface (path,
                              SPI_DBUS_INTERFACE_SELECTION,
-                             methods,
-                             properties);
+                             methods, properties);
 };