diff options
author | Ray Strode <rstrode@redhat.com> | 2018-08-02 14:00:46 -0400 |
---|---|---|
committer | Ray Strode <halfline@gmail.com> | 2018-08-02 20:06:36 +0000 |
commit | 6574b4f2705ae7e37e7e57d6b57190094c2467c7 (patch) | |
tree | 8989badf799606ca03da00520375010675896e1f /daemon | |
parent | 0e9f09da4897bdc4069298c8a4d189cd7f217f81 (diff) | |
download | gdm-6574b4f2705ae7e37e7e57d6b57190094c2467c7.tar.gz |
common: dedupe activate_session_id
Right now there are three copies of activate_session_id.
This commit consolidates the code to gdm-common.c
Diffstat (limited to 'daemon')
-rw-r--r-- | daemon/gdm-manager.c | 35 |
1 files changed, 2 insertions, 33 deletions
diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c index ac30aee9..11945522 100644 --- a/daemon/gdm-manager.c +++ b/daemon/gdm-manager.c @@ -295,37 +295,6 @@ is_login_session (GdmManager *self, } static gboolean -activate_session_id (GdmManager *manager, - const char *seat_id, - const char *session_id) -{ - GError *error = NULL; - GVariant *reply; - - reply = g_dbus_connection_call_sync (manager->priv->connection, - "org.freedesktop.login1", - "/org/freedesktop/login1", - "org.freedesktop.login1.Manager", - "ActivateSessionOnSeat", - g_variant_new ("(ss)", session_id, seat_id), - NULL, /* expected reply */ - G_DBUS_CALL_FLAGS_NONE, - -1, - NULL, - &error); - if (reply == NULL) { - g_debug ("GdmManager: logind 'ActivateSessionOnSeat' %s raised:\n %s\n\n", - g_dbus_error_get_remote_error (error), error->message); - g_error_free (error); - return FALSE; - } - - g_variant_unref (reply); - - return TRUE; -} - -static gboolean session_unlock (GdmManager *manager, const char *ssid) { @@ -621,7 +590,7 @@ switch_to_compatible_user_session (GdmManager *manager, if (existing_session != NULL) { ssid_to_activate = gdm_session_get_session_id (existing_session); if (seat_id != NULL) { - res = activate_session_id (manager, seat_id, ssid_to_activate); + res = gdm_activate_session_by_id (manager->priv->connection, seat_id, ssid_to_activate); if (! res) { g_debug ("GdmManager: unable to activate session: %s", ssid_to_activate); goto out; @@ -1329,7 +1298,7 @@ activate_login_window_session_on_seat (GdmManager *self, } if (session_id) { - activate_session_id (self, seat_id, session_id); + gdm_activate_session_by_id (self, seat_id, session_id); g_free (session_id); } } |