diff options
| author | William Jon McCann <jmccann@redhat.com> | 2008-12-03 01:49:35 +0000 |
|---|---|---|
| committer | William Jon McCann <mccann@src.gnome.org> | 2008-12-03 01:49:35 +0000 |
| commit | 816c5872dd488903bef2af5385bb72691d918eca (patch) | |
| tree | 23a97a021027ff7245f25bfb63c368ba50809155 /daemon/gdm-display.h | |
| parent | e259c339df3e9d09b43d2e3fdc49ce1cf1a96ea3 (diff) | |
| download | gdm-816c5872dd488903bef2af5385bb72691d918eca.tar.gz | |
Correctly handle changes in the xdmcp enabled property. Add a display
2008-12-02 William Jon McCann <jmccann@redhat.com>
* daemon/gdm-display.c (gdm_display_real_prepare),
(gdm_display_prepare), (gdm_display_real_manage),
(gdm_display_class_init):
* daemon/gdm-display.h:
* daemon/gdm-local-display-factory.c
(on_static_display_status_changed):
* daemon/gdm-manager.c (gdm_manager_stop), (gdm_manager_start),
(gdm_manager_set_xdmcp_enabled):
* daemon/gdm-manager.h:
* daemon/gdm-xdmcp-display-factory.c (gdm_xdmcp_display_create),
(gdm_xdmcp_handle_manage):
Correctly handle changes in the xdmcp enabled property.
Add a display state called prepared that sets up the display
before actually managing (starting) it. This is required
for the XDMCP Request phase to work.
Fixes #561396
svn path=/trunk/; revision=6610
Diffstat (limited to 'daemon/gdm-display.h')
| -rw-r--r-- | daemon/gdm-display.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/daemon/gdm-display.h b/daemon/gdm-display.h index 7e640123..2914c81b 100644 --- a/daemon/gdm-display.h +++ b/daemon/gdm-display.h @@ -38,6 +38,7 @@ typedef struct GdmDisplayPrivate GdmDisplayPrivate; typedef enum { GDM_DISPLAY_UNMANAGED = 0, + GDM_DISPLAY_PREPARED, GDM_DISPLAY_MANAGED, GDM_DISPLAY_FINISHED, GDM_DISPLAY_FAILED, @@ -65,6 +66,7 @@ typedef struct gboolean (*set_slave_bus_name) (GdmDisplay *display, const char *name, GError **error); + gboolean (*prepare) (GdmDisplay *display); gboolean (*manage) (GdmDisplay *display); gboolean (*finish) (GdmDisplay *display); gboolean (*unmanage) (GdmDisplay *display); @@ -90,6 +92,7 @@ time_t gdm_display_get_creation_time (GdmDisplay *disp char * gdm_display_get_user_auth (GdmDisplay *display); gboolean gdm_display_create_authority (GdmDisplay *display); +gboolean gdm_display_prepare (GdmDisplay *display); gboolean gdm_display_manage (GdmDisplay *display); gboolean gdm_display_finish (GdmDisplay *display); gboolean gdm_display_unmanage (GdmDisplay *display); |