Accessibility: using dbus getBindableActivityTypes method

commit requires:
https://review.tizen.org/gerrit/#/c/147510/

Change-Id: Ic8538ce1b608bc305ada2be6f5e6e344d4e14fdc

diff --git a/setting-accessibility/src/setting-accessibility-universal-switch-dbus.c b/setting-accessibility/src/setting-accessibility-universal-switch-dbus.c
index 04fbba323137a7aa27fd8fd003b16d11fbf08a32..b9aae8eb9a74ba94192a9748dfb6d73b64a34c0b 100755 (executable)
--- a/setting-accessibility/src/setting-accessibility-universal-switch-dbus.c
+++ b/setting-accessibility/src/setting-accessibility-universal-switch-dbus.c
@@ -174,7 +174,7 @@ static Eina_Array * __eldbus_getAllSwitchProviders(UniversalSwitchEldbus *eldbus
 }
 
 
-static Eina_Array * __eldbus_getAllActivityTypes(UniversalSwitchEldbus *eldbus)
+static Eina_Array * __eldbus_getBindableActivityTypes(UniversalSwitchEldbus *eldbus)
 {
        Eldbus_Message *req = NULL;
        Eldbus_Message *reply = NULL;
@@ -182,16 +182,17 @@ static Eina_Array * __eldbus_getAllActivityTypes(UniversalSwitchEldbus *eldbus)
        const char *errmsg = NULL;
        Eina_Array *activity_types = eina_array_new(EINA_ARRAY_STEPS);
 
-       if (!(req = eldbus_proxy_method_call_new(eldbus->proxy, "getAllActivityTypes"))) {
-               SETTING_TRACE_ERROR("Failed to create method call on " IFACE ".getAllActivityTypes");
+       if (!(req = eldbus_proxy_method_call_new(eldbus->proxy, "getBindableActivityTypes"))) {
+               SETTING_TRACE_ERROR("Failed to create method call on " IFACE ".getBindableActivityTypes");
                return activity_types;
        }
 
        reply = eldbus_proxy_send_and_block(eldbus->proxy, req, ELDBUS_TIMEOUT);
-       if (!reply || eldbus_message_error_get(reply, &errname, &errmsg))
-               SETTING_TRACE_ERROR("Unable to call method " IFACE ".getAllActivityTypes: %s %s", errname, errmsg);
-       else
+       if (!reply || eldbus_message_error_get(reply, &errname, &errmsg)) {
+               SETTING_TRACE_ERROR("Unable to call method " IFACE ".getBindableActivityTypes: %s %s", errname, errmsg);
+       } else {
                __eldbus_getInfoArray(activity_types, reply);
+       }
 
        if (reply)
                eldbus_message_unref(reply);
@@ -253,10 +254,11 @@ static Eina_Array * __eldbus_getAllSwitchConfigurationItems(UniversalSwitchEldbu
        }
 
        reply = eldbus_proxy_send_and_block(eldbus->proxy, req, ELDBUS_TIMEOUT);
-       if (!reply || eldbus_message_error_get(reply, &errname, &errmsg))
-               SETTING_TRACE_ERROR("Unable to call method " IFACE ".getAllActivityTypes: %s %s", errname, errmsg);
-       else
+       if (!reply || eldbus_message_error_get(reply, &errname, &errmsg)) {
+               SETTING_TRACE_ERROR("Unable to call method " IFACE ".getAllSwitchConfigurationItems: %s %s", errname, errmsg);
+       } else {
                __eldbus_getAllSwitchConfigurationItemsArray(configurationItems, reply);
+       }
 
        if (reply)
                eldbus_message_unref(reply);
@@ -356,7 +358,7 @@ static void __bus_name_acquired(void *data, const char *bus, const char *old_id,
                return;
        }
 
-       config->activity_types = __eldbus_getAllActivityTypes(&config->eldbus);
+       config->activity_types = __eldbus_getBindableActivityTypes(&config->eldbus);
        config->switch_providers = __eldbus_getAllSwitchProviders(&config->eldbus);
        __update_configuration_items(config);