diff options
author | Ray Strode <rstrode@redhat.com> | 2015-01-22 09:48:11 -0500 |
---|---|---|
committer | Ray Strode <rstrode@redhat.com> | 2015-01-22 09:52:06 -0500 |
commit | 1e1be988e21bbb207e98a8caaf179bc4f19f0dcd (patch) | |
tree | 679a3b78a2213b8a7e4ae5cef45572884b79e09f | |
parent | 163f2d14718edcabeffb785dc59f4406959b64c6 (diff) | |
download | accountsservice-1e1be988e21bbb207e98a8caaf179bc4f19f0dcd.tar.gz |
lib: don't require X11 display to fetch user
Not all X11 sessions know their display ahead of time,
so don't require that it be known to proceed.
-rw-r--r-- | src/libaccountsservice/act-user-manager.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/libaccountsservice/act-user-manager.c b/src/libaccountsservice/act-user-manager.c index a1b9a7c..cfb3585 100644 --- a/src/libaccountsservice/act-user-manager.c +++ b/src/libaccountsservice/act-user-manager.c @@ -1648,16 +1648,16 @@ _get_x11_display_for_new_systemd_session (ActUserManagerNewSession *new_session) &x11_display); if (res < 0) { - g_warning ("ActUserManager: Failed to get the x11 display of session '%s': %s", - new_session->id, - strerror (-res)); - unload_new_session (new_session); - return; + g_debug ("ActUserManager: Failed to get the x11 display of session '%s': %s", + new_session->id, + strerror (-res)); + g_debug ("ActUserManager: Treating X11 display as blank"); + x11_display = strdup (""); + } else { + g_debug ("ActUserManager: Found x11 display of session '%s': %s", + new_session->id, x11_display); } - g_debug ("ActUserManager: Found x11 display of session '%s': %s", - new_session->id, x11_display); - done: new_session->x11_display = g_strdup (x11_display); free (x11_display); @@ -1697,7 +1697,7 @@ maybe_add_new_session (ActUserManagerNewSession *new_session) is_ours = TRUE; - if (new_session->x11_display == NULL || new_session->x11_display[0] == '\0') { + if (new_session->x11_display == NULL) { g_debug ("AcUserManager: (mostly) ignoring session '%s' since it's not graphical", new_session->id); is_ours = FALSE; |