gdm r6610 - in trunk: . daemon
- From: mccann svn gnome org
- To: svn-commits-list gnome org
- Subject: gdm r6610 - in trunk: . daemon
- Date: Wed, 3 Dec 2008 01:49:35 +0000 (UTC)
Author: mccann
Date: Wed Dec 3 01:49:35 2008
New Revision: 6610
URL: http://svn.gnome.org/viewvc/gdm?rev=6610&view=rev
Log:
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
Modified:
trunk/ChangeLog
trunk/daemon/gdm-display.c
trunk/daemon/gdm-display.h
trunk/daemon/gdm-local-display-factory.c
trunk/daemon/gdm-manager.c
trunk/daemon/gdm-manager.h
trunk/daemon/gdm-xdmcp-display-factory.c
Modified: trunk/daemon/gdm-display.c
==============================================================================
--- trunk/daemon/gdm-display.c (original)
+++ trunk/daemon/gdm-display.c Wed Dec 3 01:49:35 2008
@@ -542,7 +542,7 @@
}
static gboolean
-gdm_display_real_manage (GdmDisplay *display)
+gdm_display_real_prepare (GdmDisplay *display)
{
char *command;
char *log_file;
@@ -550,7 +550,7 @@
g_return_val_if_fail (GDM_IS_DISPLAY (display), FALSE);
- g_debug ("GdmDisplay: manage display");
+ g_debug ("GdmDisplay: prepare display");
g_assert (display->priv->slave_proxy == NULL);
@@ -560,7 +560,7 @@
return FALSE;
}
- _gdm_display_set_status (display, GDM_DISPLAY_MANAGED);
+ _gdm_display_set_status (display, GDM_DISPLAY_PREPARED);
display->priv->slave_proxy = gdm_slave_proxy_new ();
g_signal_connect (display->priv->slave_proxy,
@@ -584,6 +584,48 @@
gdm_slave_proxy_set_command (display->priv->slave_proxy, command);
g_free (command);
+ return TRUE;
+}
+
+gboolean
+gdm_display_prepare (GdmDisplay *display)
+{
+ gboolean ret;
+
+ g_return_val_if_fail (GDM_IS_DISPLAY (display), FALSE);
+
+ g_debug ("GdmDisplay: Preparing display: %s", display->priv->id);
+
+ g_object_ref (display);
+ ret = GDM_DISPLAY_GET_CLASS (display)->prepare (display);
+ g_object_unref (display);
+
+ return ret;
+}
+
+
+static gboolean
+gdm_display_real_manage (GdmDisplay *display)
+{
+ char *command;
+ char *log_file;
+ char *log_path;
+ gboolean res;
+
+ g_return_val_if_fail (GDM_IS_DISPLAY (display), FALSE);
+
+ g_debug ("GdmDisplay: manage display");
+
+ /* If not explicitly prepared, do it now */
+ if (display->priv->status == GDM_DISPLAY_UNMANAGED) {
+ res = gdm_display_prepare (display);
+ if (! res) {
+ return FALSE;
+ }
+ }
+
+ g_assert (display->priv->slave_proxy != NULL);
+
g_timer_start (display->priv->slave_timer);
gdm_slave_proxy_start (display->priv->slave_proxy);
@@ -985,6 +1027,7 @@
klass->remove_user_authorization = gdm_display_real_remove_user_authorization;
klass->set_slave_bus_name = gdm_display_real_set_slave_bus_name;
klass->get_timed_login_details = gdm_display_real_get_timed_login_details;
+ klass->prepare = gdm_display_real_prepare;
klass->manage = gdm_display_real_manage;
klass->finish = gdm_display_real_finish;
klass->unmanage = gdm_display_real_unmanage;
Modified: trunk/daemon/gdm-display.h
==============================================================================
--- trunk/daemon/gdm-display.h (original)
+++ trunk/daemon/gdm-display.h Wed Dec 3 01:49:35 2008
@@ -38,6 +38,7 @@
typedef enum {
GDM_DISPLAY_UNMANAGED = 0,
+ GDM_DISPLAY_PREPARED,
GDM_DISPLAY_MANAGED,
GDM_DISPLAY_FINISHED,
GDM_DISPLAY_FAILED,
@@ -65,6 +66,7 @@
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 @@
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);
Modified: trunk/daemon/gdm-local-display-factory.c
==============================================================================
--- trunk/daemon/gdm-local-display-factory.c (original)
+++ trunk/daemon/gdm-local-display-factory.c Wed Dec 3 01:49:35 2008
@@ -324,6 +324,8 @@
break;
case GDM_DISPLAY_UNMANAGED:
break;
+ case GDM_DISPLAY_PREPARED:
+ break;
case GDM_DISPLAY_MANAGED:
break;
default:
Modified: trunk/daemon/gdm-manager.c
==============================================================================
--- trunk/daemon/gdm-manager.c (original)
+++ trunk/daemon/gdm-manager.c Wed Dec 3 01:49:35 2008
@@ -61,6 +61,7 @@
#endif
gboolean xdmcp_enabled;
+ gboolean started;
gboolean wait_for_go;
gboolean no_console;
@@ -138,9 +139,27 @@
}
void
+gdm_manager_stop (GdmManager *manager)
+{
+ g_debug ("GdmManager: GDM stopping");
+
+ if (manager->priv->local_factory != NULL) {
+ gdm_display_factory_stop (GDM_DISPLAY_FACTORY (manager->priv->local_factory));
+ }
+
+#ifdef HAVE_LIBXDMCP
+ if (manager->priv->xdmcp_factory != NULL) {
+ gdm_display_factory_stop (GDM_DISPLAY_FACTORY (manager->priv->xdmcp_factory));
+ }
+#endif
+
+ manager->priv->started = FALSE;
+}
+
+void
gdm_manager_start (GdmManager *manager)
{
- g_debug ("GdmManager: GDM starting to manage");
+ g_debug ("GdmManager: GDM starting to manage displays");
if (! manager->priv->wait_for_go) {
gdm_display_factory_start (GDM_DISPLAY_FACTORY (manager->priv->local_factory));
@@ -155,6 +174,8 @@
}
}
#endif
+
+ manager->priv->started = TRUE;
}
void
@@ -271,7 +292,24 @@
{
g_return_if_fail (GDM_IS_MANAGER (manager));
- manager->priv->xdmcp_enabled = enabled;
+ if (manager->priv->xdmcp_enabled != enabled) {
+ manager->priv->xdmcp_enabled = enabled;
+
+ if (manager->priv->xdmcp_enabled) {
+ manager->priv->xdmcp_factory = gdm_xdmcp_display_factory_new (manager->priv->display_store);
+ if (manager->priv->started) {
+ gdm_display_factory_start (GDM_DISPLAY_FACTORY (manager->priv->xdmcp_factory));
+ }
+ } else {
+ if (manager->priv->started) {
+ gdm_display_factory_stop (GDM_DISPLAY_FACTORY (manager->priv->xdmcp_factory));
+ }
+
+ g_object_unref (manager->priv->xdmcp_factory);
+ manager->priv->xdmcp_factory = NULL;
+ }
+ }
+
}
static void
Modified: trunk/daemon/gdm-manager.h
==============================================================================
--- trunk/daemon/gdm-manager.h (original)
+++ trunk/daemon/gdm-manager.h Wed Dec 3 01:49:35 2008
@@ -63,6 +63,7 @@
GdmManager * gdm_manager_new (void);
void gdm_manager_start (GdmManager *manager);
+void gdm_manager_stop (GdmManager *manager);
void gdm_manager_set_wait_for_go (GdmManager *manager,
gboolean wait_for_go);
Modified: trunk/daemon/gdm-xdmcp-display-factory.c
==============================================================================
--- trunk/daemon/gdm-xdmcp-display-factory.c (original)
+++ trunk/daemon/gdm-xdmcp-display-factory.c Wed Dec 3 01:49:35 2008
@@ -2041,6 +2041,13 @@
goto out;
}
+ if (! gdm_display_prepare (display)) {
+ gdm_display_unmanage (display);
+ g_object_unref (display);
+ display = NULL;
+ goto out;
+ }
+
store = gdm_display_factory_get_display_store (GDM_DISPLAY_FACTORY (factory));
gdm_display_store_add (store, display);
@@ -2507,7 +2514,7 @@
display = gdm_xdmcp_display_lookup (factory, clnt_sessid);
if (display != NULL &&
- gdm_display_get_status (display) == GDM_DISPLAY_UNMANAGED) {
+ gdm_display_get_status (display) == GDM_DISPLAY_PREPARED) {
char *name;
name = NULL;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]