diff options
| author | William Jon McCann <mccann@jhu.edu> | 2008-01-21 21:32:33 +0000 |
|---|---|---|
| committer | William Jon McCann <mccann@src.gnome.org> | 2008-01-21 21:32:33 +0000 |
| commit | 7c36196592b34c5df4a02bd6c4830913ad09ba1a (patch) | |
| tree | 19d1fe64592a2fc2988e0bedaf27436226a108c1 /daemon/gdm-xdmcp-display-factory.c | |
| parent | 88428c48bd5390273e16b5d9a62e40e925401585 (diff) | |
| download | gdm-7c36196592b34c5df4a02bd6c4830913ad09ba1a.tar.gz | |
Merge a few changes from the 2.20 branch.
2008-01-21 William Jon McCann <mccann@jhu.edu>
* common/gdm-address.c: (gdm_address_peek_local_list):
* daemon/gdm-xdmcp-display-factory.c:
(gdm_xdmcp_display_factory_class_init),
(gdm_xdmcp_display_factory_finalize):
Merge a few changes from the 2.20 branch.
* gui/simple-chooser/chooser-main.c: (main):
* gui/simple-greeter/Makefile.am:
* gui/simple-greeter/gdm-remote-login-window.c: (start_xephyr),
(gdm_remote_login_window_connect),
(gdm_remote_login_window_set_property),
(gdm_remote_login_window_get_property),
(gdm_remote_login_window_constructor),
(gdm_remote_login_window_class_init),
(gdm_remote_login_window_init), (gdm_remote_login_window_finalize),
(gdm_remote_login_window_new):
* gui/simple-greeter/gdm-remote-login-window.h:
* gui/simple-greeter/test-remote-login-window.c: (main):
Add initial remote login (xdmcp) client window.
svn path=/trunk/; revision=5621
Diffstat (limited to 'daemon/gdm-xdmcp-display-factory.c')
| -rw-r--r-- | daemon/gdm-xdmcp-display-factory.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/daemon/gdm-xdmcp-display-factory.c b/daemon/gdm-xdmcp-display-factory.c index 26fb250b..b3e4b483 100644 --- a/daemon/gdm-xdmcp-display-factory.c +++ b/daemon/gdm-xdmcp-display-factory.c @@ -77,6 +77,7 @@ int deny_severity = LOG_WARNING; #define DEFAULT_MAX_DISPLAYS 16 #define DEFAULT_MAX_PENDING_DISPLAYS 4 #define DEFAULT_MAX_WAIT 15 +#define DEFAULT_WILLING_SCRIPT GDMCONFDIR "/Xwilling" #define GDM_MAX_FORWARD_QUERIES 10 #define GDM_FORWARD_QUERY_TIMEOUT 30 @@ -193,7 +194,7 @@ enum { static void gdm_xdmcp_display_factory_class_init (GdmXdmcpDisplayFactoryClass *klass); static void gdm_xdmcp_display_factory_init (GdmXdmcpDisplayFactory *manager); -static void gdm_xdmcp_display_factory_finalize (GObject *object); +static void gdm_xdmcp_display_factory_finalize (GObject *object); static gpointer xdmcp_display_factory_object = NULL; @@ -2947,7 +2948,7 @@ gdm_xdmcp_display_factory_class_init (GdmXdmcpDisplayFactoryClass *klass) g_param_spec_string ("willing-script", "willing-script", "willing-script", - NULL, + DEFAULT_WILLING_SCRIPT, G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); g_object_class_install_property (object_class, PROP_MAX_DISPLAYS_PER_HOST, @@ -3036,6 +3037,11 @@ gdm_xdmcp_display_factory_finalize (GObject *object) g_source_remove (factory->priv->socket_watch_id); } + if (factory->priv->socket_fd > 0) { + close (factory->priv->socket_fd); + factory->priv->socket_fd = -1; + } + g_slist_free (factory->priv->forward_queries); g_slist_free (factory->priv->managed_forwards); |