modules/connection: use util info handlers. 62/59062/4
authorLukasz Stanislawski <l.stanislaws@samsung.com>
Tue, 9 Feb 2016 12:33:06 +0000 (13:33 +0100)
committerLukasz Stanislawski <l.stanislaws@samsung.com>
Thu, 11 Feb 2016 11:05:05 +0000 (12:05 +0100)
Replace usage of system_settings_set_changed_cb and
runtime_info_set_changed_cb with utility functions.

Change-Id: Iec09262a3780e0ebf27810b75f221393c6c13430
Signed-off-by: Lukasz Stanislawski <l.stanislaws@samsung.com>
src/modules/connection/connection.c

index 4c83198..4a993f2 100644 (file)
@@ -424,16 +424,16 @@ static int __init_tel(void *data)
                return FAIL;
        }
 
-       ret = system_settings_set_changed_cb(SYSTEM_SETTINGS_KEY_NETWORK_FLIGHT_MODE, _flight_mode, data);
-       if (ret != SYSTEM_SETTINGS_ERROR_NONE) {
-               ERR("system_settings_set_changed_cb %d", get_error_message(ret));
+       ret = util_system_settings_set_changed_cb(SYSTEM_SETTINGS_KEY_NETWORK_FLIGHT_MODE, _flight_mode, data);
+       if (ret != 0) {
+               ERR("util_system_settings_set_changed_cb failed");
                __deinit_tel();
                return FAIL;
        }
 
-       ret = runtime_info_set_changed_cb(RUNTIME_INFO_KEY_BLUETOOTH_TETHERING_ENABLED, _update_status_ri, data);
-       if (ret != RUNTIME_INFO_ERROR_NONE) {
-               ERR("runtime_info_set_changed_cb %d", get_error_message(ret));
+       ret = util_runtime_info_set_changed_cb(RUNTIME_INFO_KEY_BLUETOOTH_TETHERING_ENABLED, _update_status_ri, data);
+       if (ret != 0) {
+               ERR("util_runtime_info_set_changed_cb failed");
                __deinit_tel();
                return FAIL;
        }
@@ -448,9 +448,9 @@ static void __deinit_tel()
 {
        DBG("__deinit_tel");
 
-       system_settings_unset_changed_cb(SYSTEM_SETTINGS_KEY_NETWORK_FLIGHT_MODE);
+       util_system_settings_unset_changed_cb(SYSTEM_SETTINGS_KEY_NETWORK_FLIGHT_MODE, _flight_mode);
        util_wifi_unset_connection_state_changed_cb(_wifi_status_changed_cb);
-       runtime_info_unset_changed_cb(RUNTIME_INFO_KEY_BLUETOOTH_TETHERING_ENABLED);
+       util_runtime_info_unset_changed_cb(RUNTIME_INFO_KEY_BLUETOOTH_TETHERING_ENABLED, _update_status_ri);
 
        if (tel_list.count)
                telephony_deinit(&tel_list);