X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git;a=blobdiff_plain;f=atk-adaptor%2Faction-adaptor.c;h=451e38c639ae39e4cad7ff31d227a80008a28070;hp=8f3f5653dd2148d47b86162463b92e1a7825de63;hb=e9d9fedb0c914825a3ccd8b390deb52a93800415;hpb=01fb83c0ba436a54fd5450c04b8511b2409b90e2 diff --git a/atk-adaptor/action-adaptor.c b/atk-adaptor/action-adaptor.c index 8f3f565..451e38c 100644 --- a/atk-adaptor/action-adaptor.c +++ b/atk-adaptor/action-adaptor.c @@ -28,7 +28,7 @@ #include "common/spi-dbus.h" static dbus_bool_t -impl_get_NActions (DBusMessageIter *iter, void *user_data) +impl_get_NActions (DBusMessageIter * iter, void *user_data) { AtkAction *action = (AtkAction *) user_data; @@ -37,7 +37,8 @@ impl_get_NActions (DBusMessageIter *iter, void *user_data) } static DBusMessage * -impl_get_description (DBusConnection *bus, DBusMessage *message, void *user_data) +impl_get_description (DBusConnection * bus, DBusMessage * message, + void *user_data) { AtkAction *action = (AtkAction *) user_data; DBusError error; @@ -48,22 +49,25 @@ impl_get_description (DBusConnection *bus, DBusMessage *message, void *user_data dbus_error_init (&error); g_return_val_if_fail (ATK_IS_ACTION (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args (message, &error, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) - { - return droute_invalid_arguments_error (message); - } - desc = atk_action_get_description(action, index); - if (!desc) desc = ""; + if (!dbus_message_get_args + (message, &error, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) + { + return droute_invalid_arguments_error (message); + } + desc = atk_action_get_description (action, index); + if (!desc) + desc = ""; reply = dbus_message_new_method_return (message); if (reply) - { - dbus_message_append_args (reply, DBUS_TYPE_STRING, &desc, DBUS_TYPE_INVALID); - } + { + dbus_message_append_args (reply, DBUS_TYPE_STRING, &desc, + DBUS_TYPE_INVALID); + } return reply; } static DBusMessage * -impl_get_name (DBusConnection *bus, DBusMessage *message, void *user_data) +impl_get_name (DBusConnection * bus, DBusMessage * message, void *user_data) { DBusMessage *reply; DBusError error; @@ -74,22 +78,26 @@ impl_get_name (DBusConnection *bus, DBusMessage *message, void *user_data) dbus_error_init (&error); g_return_val_if_fail (ATK_IS_ACTION (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args (message, &error, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) - { - return droute_invalid_arguments_error (message); - } - name = atk_action_get_name(action, index); - if (!name) name = ""; + if (!dbus_message_get_args + (message, &error, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) + { + return droute_invalid_arguments_error (message); + } + name = atk_action_get_name (action, index); + if (!name) + name = ""; reply = dbus_message_new_method_return (message); if (reply) - { - dbus_message_append_args (reply, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID); - } + { + dbus_message_append_args (reply, DBUS_TYPE_STRING, &name, + DBUS_TYPE_INVALID); + } return reply; } static DBusMessage * -impl_get_keybinding (DBusConnection *bus, DBusMessage *message, void *user_data) +impl_get_keybinding (DBusConnection * bus, DBusMessage * message, + void *user_data) { DBusMessage *reply; DBusError error; @@ -100,21 +108,25 @@ impl_get_keybinding (DBusConnection *bus, DBusMessage *message, void *user_data) dbus_error_init (&error); g_return_val_if_fail (ATK_IS_ACTION (user_data), droute_not_yet_handled_error (message)); - if (!dbus_message_get_args (message, &error, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) - { - return droute_invalid_arguments_error (message); - } - kb = atk_action_get_keybinding(action, index); - if (!kb) kb = ""; + if (!dbus_message_get_args + (message, &error, DBUS_TYPE_INT32, &index, DBUS_TYPE_INVALID)) + { + return droute_invalid_arguments_error (message); + } + kb = atk_action_get_keybinding (action, index); + if (!kb) + kb = ""; reply = dbus_message_new_method_return (message); if (reply) - { - dbus_message_append_args (reply, DBUS_TYPE_STRING, &kb, DBUS_TYPE_INVALID); - } + { + dbus_message_append_args (reply, DBUS_TYPE_STRING, &kb, + DBUS_TYPE_INVALID); + } return reply; } -static DBusMessage *impl_GetActions(DBusConnection *bus, DBusMessage *message, void *user_data) +static DBusMessage * +impl_GetActions (DBusConnection * bus, DBusMessage * message, void *user_data) { AtkAction *action = (AtkAction *) user_data; DBusMessage *reply; @@ -124,26 +136,33 @@ static DBusMessage *impl_GetActions(DBusConnection *bus, DBusMessage *message, v g_return_val_if_fail (ATK_IS_ACTION (user_data), droute_not_yet_handled_error (message)); - count = atk_action_get_n_actions(action); + count = atk_action_get_n_actions (action); reply = dbus_message_new_method_return (message); - if (!reply) goto oom; + if (!reply) + goto oom; dbus_message_iter_init_append (reply, &iter); if (!dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, "(sss)", &iter_array)) goto oom; for (i = 0; i < count; i++) { - const char *name = atk_action_get_name(action, i); - const char *desc = atk_action_get_description(action, i); - const char *kb = atk_action_get_keybinding(action, i); - if (!name) name = ""; - if (!desc) desc = ""; - if (!kb) kb = ""; - if (!dbus_message_iter_open_container(&iter_array, DBUS_TYPE_STRUCT, NULL, &iter_struct)) goto oom; - dbus_message_iter_append_basic(&iter_struct, DBUS_TYPE_STRING, &name); - dbus_message_iter_append_basic(&iter_struct, DBUS_TYPE_STRING, &desc); - dbus_message_iter_append_basic(&iter_struct, DBUS_TYPE_STRING, &kb); - if (!dbus_message_iter_close_container(&iter_array, &iter_struct)) goto oom; + const char *name = atk_action_get_name (action, i); + const char *desc = atk_action_get_description (action, i); + const char *kb = atk_action_get_keybinding (action, i); + if (!name) + name = ""; + if (!desc) + desc = ""; + if (!kb) + kb = ""; + if (!dbus_message_iter_open_container + (&iter_array, DBUS_TYPE_STRUCT, NULL, &iter_struct)) + goto oom; + dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_STRING, &name); + dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_STRING, &desc); + dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_STRING, &kb); + if (!dbus_message_iter_close_container (&iter_array, &iter_struct)) + goto oom; } if (!dbus_message_iter_close_container (&iter, &iter_array)) goto oom; @@ -153,7 +172,8 @@ oom: return reply; } -static DBusMessage *impl_DoAction(DBusConnection *bus, DBusMessage *message, void *user_data) +static DBusMessage * +impl_DoAction (DBusConnection * bus, DBusMessage * message, void *user_data) { AtkAction *action = (AtkAction *) user_data; DBusError error; @@ -169,36 +189,38 @@ static DBusMessage *impl_DoAction(DBusConnection *bus, DBusMessage *message, voi { return droute_invalid_arguments_error (message); } - rv = atk_action_do_action(action, index); + rv = atk_action_do_action (action, index); reply = dbus_message_new_method_return (message); if (reply) { - dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &rv, DBUS_TYPE_INVALID); + dbus_message_append_args (reply, DBUS_TYPE_BOOLEAN, &rv, + DBUS_TYPE_INVALID); } return reply; } -DRouteMethod methods[] = -{ - { impl_get_description, "GetDescription" }, - { impl_get_name, "GetName" }, - { impl_get_keybinding, "GetKeyBinding" }, - {impl_GetActions, "GetActions"}, - {impl_DoAction, "DoAction"}, - {NULL, NULL } +DRouteMethod methods[] = { + {impl_get_description, "GetDescription"} + , + {impl_get_name, "GetName"} + , + {impl_get_keybinding, "GetKeyBinding"} + , + {impl_GetActions, "GetActions"} + , + {impl_DoAction, "DoAction"} + , + {NULL, NULL} }; -static DRouteProperty properties[] = -{ - { impl_get_NActions, NULL, "NActions" }, - { NULL, NULL } +static DRouteProperty properties[] = { + {impl_get_NActions, NULL, "NActions"}, + {NULL, NULL} }; void -spi_initialize_action (DRoutePath *path) +spi_initialize_action (DRoutePath * path) { droute_path_add_interface (path, - SPI_DBUS_INTERFACE_ACTION, - methods, - properties); + SPI_DBUS_INTERFACE_ACTION, methods, properties); };