Drop status_code

Change-Id: I78d47535f1633cb7510a43e1ecbaa6faed3894cd

diff --git a/doc/sessiond-dbus-interface.md b/doc/sessiond-dbus-interface.md
index f347209..a295dd4 100644 (file)
--- a/doc/sessiond-dbus-interface.md
+++ b/doc/sessiond-dbus-interface.md
@@ -134,27 +134,26 @@ In case of an error, methods return a DBus error.
         objpath: /org/tizen/sessiond
         interface: org.tizen.sessiond.subsession.Manager
         member: AddUserCompleted
-        parameters: (iii)
+        parameters: (ii)
             session_uid <int32>
             subsession_id <int32>
-            status_code <int32>
 
 5. On user removal completed:
 
         objpath: /org/tizen/sessiond
         interface: org.tizen.sessiond.subsession.Manager
         member: RemoveUserCompleted
-        parameters: (iii)
+        parameters: (ii)
             session_uid <int32>
             subsession_id <int32>
-            status_code <int32>
 
 6. On user switch completed:
 
         objpath: /org/tizen/sessiond
         interface: org.tizen.sessiond.subsession.Manager
         member: SwitchUserCompleted
-        parameters: (ixi)
+        parameters: (ixii)
             session_uid <int32>
             switch_id <int64>
-            status_code <int32>
+            prev_subsession_id <int32>
+            next_subsession_id <int32>

diff --git a/sessiond/src/main.cpp b/sessiond/src/main.cpp
index 5347a9d..b3ed7b4 100644 (file)
--- a/sessiond/src/main.cpp
+++ b/sessiond/src/main.cpp
@@ -248,7 +248,7 @@ struct wait_manager {
        {
                GError *err = nullptr;
                if (!g_dbus_connection_emit_signal(connection, nullptr, bus_object.data(), bus_iface.data(), completion_signal.data(),
-                               tuple_to_g_variant(std::tuple_cat(std::make_tuple(session_uid), v, std::make_tuple<int>(0))), &err)) // Note that we always return 0 since we have succeeded.
+                               tuple_to_g_variant(std::tuple_cat(std::make_tuple(session_uid), v)), &err))
                        g_error_throw(err, "Failed to emit a signal: ");
        }
 
@@ -582,19 +582,16 @@ struct sessiond_context {
                                "<signal name=\"AddUserCompleted\">"
                                        "<arg name=\"session_uid\"        type=\"i\" direction=\"out\"/>"
                                        "<arg name=\"subsession_id\"      type=\"i\" direction=\"out\"/>"
-                                       "<arg name=\"status_code\"        type=\"i\" direction=\"out\"/>"
                                "</signal>"
                                "<signal name=\"RemoveUserCompleted\">"
                                        "<arg name=\"session_uid\"        type=\"i\" direction=\"out\"/>"
                                        "<arg name=\"subsession_id\"      type=\"i\" direction=\"out\"/>"
-                                       "<arg name=\"status_code\"        type=\"i\" direction=\"out\"/>"
                                "</signal>"
                                "<signal name=\"SwitchUserCompleted\">"
                                        "<arg name=\"session_uid\"        type=\"i\" direction=\"out\"/>"
                                        "<arg name=\"switch_id\"          type=\"x\" direction=\"out\"/>"
                                        "<arg name=\"prev_subsession_id\" type=\"i\" direction=\"out\"/>"
                                        "<arg name=\"next_subsession_id\" type=\"i\" direction=\"out\"/>"
-                                       "<arg name=\"status_code\"        type=\"i\" direction=\"out\"/>"
                                "</signal>"
                        "</interface>"
                "</node>";