Make '__ua_monitor_send_user_absence_cb' consistent with '__ua_monitor_send_user_pres...

Pass user_state pointer as the method parameter.

Change-Id: I7a10855f2aa3b12eee156b4855124255fe3e8ed0
Signed-off-by: Lokesh <l.kasana@samsung.com>

diff --git a/packaging/capi-network-ua.spec b/packaging/capi-network-ua.spec
index 3f8dc2c95f670b82c681b39dc865f69ce577b40b..9c8f8525d80a7192a02cc529c4e89a0e782e16fe 100644 (file)
--- a/packaging/capi-network-ua.spec
+++ b/packaging/capi-network-ua.spec
@@ -1,6 +1,6 @@
 Name: capi-network-ua
 Summary: User Awareness Framework CAPI
-Version: 0.8.6
+Version: 0.8.7
 Release: 1
 License: Apache-2.0
 Source0: %{name}-%{version}.tar.gz

diff --git a/src/user-awareness-monitors.c b/src/user-awareness-monitors.c
index 69ebf9bf2f4c0115e36dd07efa58d64cd1435ffb..4f9f7fcd1eee6f578325a05ac47e401f58acd455 100644 (file)
--- a/src/user-awareness-monitors.c
+++ b/src/user-awareness-monitors.c
@@ -430,14 +430,18 @@ static void __ua_sensor_presence_detected(ua_monitor_s *monitor,
 }
 
 static void __ua_monitor_send_user_absence_cb(ua_monitor_s *monitor,
-       ua_user_h user_handle, unsigned int user_sensor_bitmask)
+               ua_user_state_info_s *user_state)
 {
        FUNC_ENTRY;
        unsigned int env_absence_bitmask = 0;
+       unsigned int user_sensor_bitmask = user_state->sensor_bitmask;
        gboolean and_condition = 0;
        gboolean or_condition = 0;
        gboolean condition_result = 0;
 
+       ua_user_h user_handle = _ua_get_user_handle_by_account(
+                       user_state->account);
+
        /**
         * Check whether user_handle present or not and also check
         * whether presence has been started or not.
@@ -537,12 +541,8 @@ static void __ua_send_absence_detection()
                        ua_user_state_info_s *user_state = l1->data;
 
                        UA_INFO("Scanning user list...");
-                       if (!user_state)
-                               continue;
-
-                       ua_user_h user_handle = _ua_get_user_handle_by_account(user_state->account);
-                       __ua_monitor_send_user_absence_cb(monitor, user_handle,
-                                                         user_state->sensor_bitmask);
+                       if (user_state)
+                               __ua_monitor_send_user_absence_cb(monitor, user_state);
                }
        }