remove 'prev_user' parameter from libsessiond

Change-Id: I459e947e3a2177f66f327359a4a9e77aa0da7d8f

diff --git a/libsessiond/include/sessiond.h b/libsessiond/include/sessiond.h
index baed703..4c6e6be 100644 (file)
--- a/libsessiond/include/sessiond.h
+++ b/libsessiond/include/sessiond.h
@@ -77,7 +77,7 @@ typedef union subsession_event_info {
 typedef int (*subsession_reply_callback) (int result, void *cb_data);
 int subsession_add_user(int session_uid, int user, subsession_reply_callback cb, void *cb_data);
 int subsession_remove_user(int session_uid, int user, subsession_reply_callback cb, void *cb_data);
-int subsession_switch_user(int session_uid, int prev_user, int next_user, subsession_reply_callback cb, void *cb_data);
+int subsession_switch_user(int session_uid, int next_user, subsession_reply_callback cb, void *cb_data);
 
 int subsession_add_user_wait_done(int session_uid, int user);
 int subsession_remove_user_wait_done(int session_uid, int user);

diff --git a/libsessiond/src/lib.c b/libsessiond/src/lib.c
index c24312c..919beb9 100644 (file)
--- a/libsessiond/src/lib.c
+++ b/libsessiond/src/lib.c
@@ -358,9 +358,8 @@ gint g_compare_switch_user_params (  gconstpointer client_data,   gconstpointer
        signal_client_data_t *signal_client_data = (signal_client_data_t*)client_data;
 
        int client_session_uid = 0;
-       int client_prev_user = 0;
        int client_next_user = 0;
-       maybe_g_variant_get_int_(signal_client_data->params, "(iii)", &client_session_uid, &client_prev_user, &client_next_user);
+       maybe_g_variant_get_int_(signal_client_data->params, "(ii)", &client_session_uid, &client_next_user);
 
        GVariant *params = (GVariant *)parameters;
 
@@ -372,8 +371,7 @@ gint g_compare_switch_user_params (  gconstpointer client_data,   gconstpointer
        maybe_g_variant_get_int_(params, "(ixii)", &params_session_uid, &params_switch_id, &params_prev_user, &params_next_user);
 
        gboolean all_ok = (client_session_uid == params_session_uid) &&
-                                        (client_prev_user == params_prev_user) &&
-                                        (client_next_user == params_next_user);
+                                       (client_next_user == params_next_user);
 
        if( all_ok) {
                return COMPARATOR_RESULT_SAME_;
@@ -505,7 +503,7 @@ static void signal_switch_user_started_handler(GDBusConnection *connection,
                return ;
        }
 
-               subsession_event_info event_info = {0};
+       subsession_event_info event_info = {0};
 
        event_info.switch_user.event = SUBSESSION_SWITCH_USER_WAIT;
        maybe_g_variant_get_void_(parameters, "(ixii)",
@@ -764,14 +762,14 @@ EXPORT_API int subsession_remove_user(int session_uid, int user, subsession_repl
        return method_call_result;
 }
 
-EXPORT_API int subsession_switch_user(int session_uid, int prev_user, int next_user, subsession_reply_callback cb, void *cb_data) {
+EXPORT_API int subsession_switch_user(int session_uid, int next_user, subsession_reply_callback cb, void *cb_data) {
 
        g_mutex_lock (&switch_user_callbacks_data_mt.mutex);
 
-       init_callbacks_list(&switch_user_callbacks_data_mt,  g_variant_new("(iii)", -1, -1, -1));
+       init_callbacks_list(&switch_user_callbacks_data_mt,  g_variant_new("(ii)", -1, -1));
 
        GVariant * params;
-       params = g_variant_new("(iii)", session_uid, prev_user, next_user);
+       params = g_variant_new("(ii)", session_uid, next_user);
 
        signal_client_data_t *signal_client_data = make_new_signal_callback_client_data(cb, cb_data, params);
        callbacks_data_append_to_list(switch_user_callbacks_data_mt, signal_client_data);

diff --git a/libsessiond/target_test/test_api_switch_user_wait.cpp b/libsessiond/target_test/test_api_switch_user_wait.cpp
index 09690cd..daef54b 100644 (file)
--- a/libsessiond/target_test/test_api_switch_user_wait.cpp
+++ b/libsessiond/target_test/test_api_switch_user_wait.cpp
@@ -26,9 +26,6 @@ int test_reply_callback (int result, void *cb_data) {
        return result;
 }
 
-
-
-
 int tud_atomic_int_get(test_user_data_cb_t &arg) {
        return g_atomic_int_get(&arg.callback_reference);
 }
@@ -119,8 +116,7 @@ TEST(subsession_switch_user_wait, APISwitchUserStarted) {
        std::get<switch_user>(ud.t).prev_user_id = user_1;
        std::get<switch_user>(ud.t).user_id = user_2;
 
-       int switch_user_res = subsession_switch_user(test_subsession_uid, std::get<switch_user>(ud.t).prev_user_id
-               , std::get<switch_user>(ud.t).user_id, test_reply_callback, (void *)&std::get<switch_user>(ud.t));
+       int switch_user_res = subsession_switch_user(test_subsession_uid, std::get<switch_user>(ud.t).user_id, test_reply_callback, (void *)&std::get<switch_user>(ud.t));
 
        int remove_user_res_1 = remove_user_wrap<remove_user_1>(user_1, test_reply_callback, ud);
 
@@ -130,7 +126,6 @@ TEST(subsession_switch_user_wait, APISwitchUserStarted) {
        g_idle_add(callback_pending_ud<ud_>,(gpointer*)&ud);
        g_main_loop_run(ud.loop);
 
-
        EXPECT_EQ(switch_user_wait_res, 0);
        EXPECT_EQ(add_user_res_1, 0);
        EXPECT_EQ(remove_user_res_1, 0);

diff --git a/libsessiond/target_test/test_api_switchuser.cpp b/libsessiond/target_test/test_api_switchuser.cpp
index 501b12f..47d0c19 100644 (file)
--- a/libsessiond/target_test/test_api_switchuser.cpp
+++ b/libsessiond/target_test/test_api_switchuser.cpp
@@ -135,7 +135,6 @@ TEST(subsession_switch_user_test, APISwitchUserTest) {
        test_switch_1_1_to_2.callback_result = -1;
 
        int switch_user_res_1_1_to_2 = subsession_switch_user(test_switch_1_1_to_2.session_id,
-               test_switch_1_1_to_2.prev_user_id,
                test_switch_1_1_to_2.next_user_id,
                test_reply_switchuser_callback, (void *)&test_switch_1_1_to_2);