X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=libspi%2Fapplication.c;h=f43a00026d557b1bf31f2e1698a1c6f10e112615;hb=8e1a831f81570671c59e043e861b4bf4d2ec9754;hp=c99064fd22b0deb2a7ec1d099bbf6e696b3495fd;hpb=ae7080990bc816a73d86ba9957eee4d876f40a06;p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git diff --git a/libspi/application.c b/libspi/application.c index c99064f..f43a000 100644 --- a/libspi/application.c +++ b/libspi/application.c @@ -31,24 +31,12 @@ impl_get_toolkitName (const char *path, DBusMessageIter * iter, return droute_return_v_string (iter, atk_get_toolkit_name ()); } -static char * -impl_get_toolkitName_str (void *datum) -{ - return g_strdup (atk_get_toolkit_name ()); -} - static dbus_bool_t impl_get_version (const char *path, DBusMessageIter * iter, void *user_data) { return droute_return_v_string (iter, atk_get_toolkit_version ()); } -static char * -impl_get_version_str (void *datum) -{ - return g_strdup (atk_get_toolkit_version ()); -} - static dbus_int32_t id; static dbus_bool_t @@ -57,12 +45,6 @@ impl_get_id (const char *path, DBusMessageIter * iter, void *user_data) return droute_return_v_int32 (iter, id); } -static char * -impl_get_id_str (void *datum) -{ - return g_strdup_printf ("%d", id); -} - static dbus_bool_t impl_set_id (const char *path, DBusMessageIter * iter, void *user_data) { @@ -74,46 +56,48 @@ static DBusMessage * impl_registerToolkitEventListener (DBusConnection * bus, DBusMessage * message, void *user_data) { + return NULL; } static DBusMessage * impl_registerObjectEventListener (DBusConnection * bus, DBusMessage * message, void *user_data) { + return NULL; } static DBusMessage * impl_pause (DBusConnection * bus, DBusMessage * message, void *user_data) { + return NULL; } static DBusMessage * impl_resume (DBusConnection * bus, DBusMessage * message, void *user_data) { + return NULL; } static DBusMessage * impl_getLocale (DBusConnection * bus, DBusMessage * message, void *user_data) { + return NULL; } static DRouteMethod methods[] = { - {DROUTE_METHOD, impl_registerToolkitEventListener, - "registerToolkitEventListener", "o,listener,i:s,eventName,i"}, - {DROUTE_METHOD, impl_registerObjectEventListener, - "registerObjectEventListener", "o,listener,i:s,eventName,i"}, - {DROUTE_METHOD, impl_pause, "pause", "b,,o"}, - {DROUTE_METHOD, impl_resume, "resume", "b,,o"}, - {DROUTE_METHOD, impl_getLocale, "getLocale", "u,lctype,i:s,,o"}, - {0, NULL, NULL, NULL} + {impl_registerToolkitEventListener, "registerToolkitEventListener"}, + {impl_registerObjectEventListener, "registerObjectEventListener"}, + {impl_pause, "pause"}, + {impl_resume, "resume"}, + {impl_getLocale, "getLocale"}, + {NULL, NULL} }; static DRouteProperty properties[] = { - {impl_get_toolkitName, impl_get_toolkitName_str, NULL, NULL, "toolkitName", - "s"}, - {impl_get_version, impl_get_version_str, NULL, NULL, "version", "s"}, - {impl_get_id, impl_get_id_str, impl_set_id, NULL, "id", "i"}, - {NULL, NULL, NULL, NULL, NULL, NULL} + {impl_get_toolkitName, NULL, "toolkitName"}, + {impl_get_version, NULL, "version"}, + {impl_get_id, impl_set_id, "id"}, + {NULL, NULL, NULL} }; static long @@ -126,7 +110,7 @@ obj_is_root (const char *path, void *user_data) void spi_initialize_application (DRouteData * data) { - droute_add_interface (data, "org.freedesktop.accessibility.Application", + droute_add_interface (data, "org.freedesktop.atspi.Application", methods, properties, (DRouteGetDatumFunction) obj_is_root, NULL); };