From b0e22a3d6fe47aa4ddb2988fa06b640e456daf29 Mon Sep 17 00:00:00 2001 From: Olivier Fourdan Date: Wed, 20 Jul 2011 08:22:03 -0400 Subject: [PATCH] daemon: Plug XDMCP chooser leak The GDM chooser will leak a file descriptor for the auth file each time the chooser is restarted. This commit plugs the leak in a similar way to commit 0c34aa7949bc24a2a8b3217cefb3c978b892591b but for the chooser instead of remote greeters. --- daemon/gdm-xdmcp-chooser-display.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/daemon/gdm-xdmcp-chooser-display.c b/daemon/gdm-xdmcp-chooser-display.c index 85bd3b7..5c7377e 100644 --- a/daemon/gdm-xdmcp-chooser-display.c +++ b/daemon/gdm-xdmcp-chooser-display.c @@ -68,6 +68,7 @@ static guint signals [LAST_SIGNAL] = { 0, }; static void gdm_xdmcp_chooser_display_class_init (GdmXdmcpChooserDisplayClass *klass); static void gdm_xdmcp_chooser_display_init (GdmXdmcpChooserDisplay *xdmcp_chooser_display); static void gdm_xdmcp_chooser_display_finalize (GObject *object); +static gboolean gdm_xdmcp_chooser_display_finish (GdmDisplay *display); G_DEFINE_TYPE (GdmXdmcpChooserDisplay, gdm_xdmcp_chooser_display, GDM_TYPE_XDMCP_DISPLAY) @@ -165,6 +166,7 @@ gdm_xdmcp_chooser_display_class_init (GdmXdmcpChooserDisplayClass *klass) display_class->manage = gdm_xdmcp_chooser_display_manage; display_class->set_slave_bus_name = gdm_xdmcp_chooser_display_set_slave_bus_name; + display_class->finish = gdm_xdmcp_chooser_display_finish; signals [HOSTNAME_SELECTED] = g_signal_new ("hostname-selected", @@ -209,6 +211,18 @@ gdm_xdmcp_chooser_display_finalize (GObject *object) G_OBJECT_CLASS (gdm_xdmcp_chooser_display_parent_class)->finalize (object); } +static gboolean +gdm_xdmcp_chooser_display_finish (GdmDisplay *display) +{ + g_return_val_if_fail (GDM_IS_DISPLAY (display), FALSE); + + GDM_DISPLAY_CLASS (gdm_xdmcp_chooser_display_parent_class)->finish (display); + + gdm_display_unmanage (display); + + return TRUE; +} + GdmDisplay * gdm_xdmcp_chooser_display_new (const char *hostname, int number, -- 1.7.1