diff options
| author | Ray Strode <rstrode@redhat.com> | 2015-03-17 13:46:21 -0400 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2015-03-19 20:26:35 -0400 |
| commit | 63b0ce137248fb210b22227bb85956540e02bae3 (patch) | |
| tree | e7cd91f6c34994db5b7c6d3fb775562599ab0048 | |
| parent | ed31a2b8daa1ad391c806c0c27cbe36c3135868a (diff) | |
| download | gdm-63b0ce137248fb210b22227bb85956540e02bae3.tar.gz | |
manager: move initial login handling to function
After the greeter is started, we may start any pending initial-setup
login from the user. Right now we do that directly from
on_display_status_changed.
This commit moves the code off to a subroutine, since it's only going
to get more complicated in the future.
https://bugzilla.gnome.org/show_bug.cgi?id=746492
| -rw-r--r-- | daemon/gdm-manager.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c index a0a95f3f..902810b3 100644 --- a/daemon/gdm-manager.c +++ b/daemon/gdm-manager.c @@ -1680,6 +1680,19 @@ set_up_greeter_session (GdmManager *manager, } static void +greeter_display_started (GdmManager *manager, + GdmDisplay *display) +{ + if (manager->priv->ran_once) { + return; + } + + maybe_start_pending_initial_login (manager, display); + + manager->priv->ran_once = TRUE; +} + +static void on_display_status_changed (GdmDisplay *display, GParamSpec *arg1, GdmManager *manager) @@ -1729,9 +1742,7 @@ on_display_status_changed (GdmDisplay *display, manager->priv->plymouth_is_running = FALSE; } #endif - maybe_start_pending_initial_login (manager, display); - - manager->priv->ran_once = TRUE; + greeter_display_started (manager, display); } break; case GDM_DISPLAY_FAILED: |