diff options
author | Ray Strode <rstrode@redhat.com> | 2015-01-29 16:25:37 -0500 |
---|---|---|
committer | Ray Strode <rstrode@redhat.com> | 2015-02-18 17:34:12 -0500 |
commit | 50f32ce669d927460df4754e917a1f19f0c656bb (patch) | |
tree | 1b2e262e0008f9ef03e83e8d6d019e33953a6e56 /daemon/gdm-local-display.c | |
parent | 0cc8b02f339d7661999a08f9c35cc51d5a2d5531 (diff) | |
download | gdm-50f32ce669d927460df4754e917a1f19f0c656bb.tar.gz |
display: start greeter/chooser session from display object
We're trying to get rid of the slave code, so we need to
move responibility for launching the greeter to the
display objects.
This commit changes the display classes to set up a
launch environment that the base class runs.
https://bugzilla.gnome.org/show_bug.cgi?id=744764
Diffstat (limited to 'daemon/gdm-local-display.c')
-rw-r--r-- | daemon/gdm-local-display.c | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/daemon/gdm-local-display.c b/daemon/gdm-local-display.c index caaf3041..112a7cd2 100644 --- a/daemon/gdm-local-display.c +++ b/daemon/gdm-local-display.c @@ -38,6 +38,7 @@ #include "gdm-common.h" #include "gdm-display.h" +#include "gdm-launch-environment.h" #include "gdm-local-display.h" #include "gdm-local-display-glue.h" @@ -82,14 +83,53 @@ gdm_local_display_finalize (GObject *object) G_OBJECT_CLASS (gdm_local_display_parent_class)->finalize (object); } +static gboolean +gdm_local_display_prepare (GdmDisplay *display) +{ + GdmLocalDisplay *self = GDM_LOCAL_DISPLAY (display); + GdmLaunchEnvironment *launch_environment; + char *display_name; + char *seat_id; + gboolean doing_initial_setup = FALSE; + + display_name = NULL; + seat_id = NULL; + + g_object_get (self, + "x11-display-name", &display_name, + "seat-id", &seat_id, + "doing-initial-setup", &doing_initial_setup, + NULL); + + if (!doing_initial_setup) { + launch_environment = gdm_create_greeter_launch_environment (display_name, + seat_id, + NULL, + TRUE); + } else { + launch_environment = gdm_create_initial_setup_launch_environment (display_name, + seat_id, + NULL, + TRUE); + } + + g_object_set (self, "launch-environment", launch_environment, NULL); + g_object_unref (launch_environment); + + return GDM_DISPLAY_CLASS (gdm_local_display_parent_class)->prepare (display); +} + static void gdm_local_display_class_init (GdmLocalDisplayClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); + GdmDisplayClass *display_class = GDM_DISPLAY_CLASS (klass); object_class->constructor = gdm_local_display_constructor; object_class->finalize = gdm_local_display_finalize; + display_class->prepare = gdm_local_display_prepare; + g_type_class_add_private (klass, sizeof (GdmLocalDisplayPrivate)); } |