[gdm/wip/slave-display-merger: 5/29] xdmcp-greeter-display: gut into the useless stub it is



commit dd2f599d4f47ececb71ed80b802a424d2f0137b6
Author: Ray Strode <rstrode redhat com>
Date:   Mon Jan 19 09:09:49 2015 -0500

    xdmcp-greeter-display: gut into the useless stub it is
    
    This commit drops the finish implementation from the
    xdmcp-greeter-display subclass.  It's mostly just chaining up, but it
    also calls "unmanage" which is strange and probably wrong.
    
    At the same time, it turns out pretty much all the other code in the
    file is superfluous, too, so this commit kills it all dead.
    
    A future commit will probably get rid of the file entirely.

 daemon/gdm-xdmcp-greeter-display.c |   50 ------------------------------------
 1 files changed, 0 insertions(+), 50 deletions(-)
---
diff --git a/daemon/gdm-xdmcp-greeter-display.c b/daemon/gdm-xdmcp-greeter-display.c
index 7818a0e..1aa35ac 100644
--- a/daemon/gdm-xdmcp-greeter-display.c
+++ b/daemon/gdm-xdmcp-greeter-display.c
@@ -43,69 +43,19 @@
 
 #define GDM_XDMCP_GREETER_DISPLAY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), 
GDM_TYPE_XDMCP_GREETER_DISPLAY, GdmXdmcpGreeterDisplayPrivate))
 
-struct GdmXdmcpGreeterDisplayPrivate
-{
-        GdmAddress             *remote_address;
-        gint32                  session_number;
-};
-
-enum {
-        PROP_0,
-        PROP_REMOTE_ADDRESS,
-        PROP_SESSION_NUMBER,
-};
-
 static void     gdm_xdmcp_greeter_display_class_init    (GdmXdmcpGreeterDisplayClass *klass);
 static void     gdm_xdmcp_greeter_display_init          (GdmXdmcpGreeterDisplay      *xdmcp_greeter_display);
-static void     gdm_xdmcp_greeter_display_finalize      (GObject                     *object);
-static gboolean gdm_xdmcp_greeter_display_finish (GdmDisplay *display);
 
 G_DEFINE_TYPE (GdmXdmcpGreeterDisplay, gdm_xdmcp_greeter_display, GDM_TYPE_XDMCP_DISPLAY)
 
 static void
 gdm_xdmcp_greeter_display_class_init (GdmXdmcpGreeterDisplayClass *klass)
 {
-        GObjectClass    *object_class = G_OBJECT_CLASS (klass);
-        GdmDisplayClass *display_class = GDM_DISPLAY_CLASS (klass);
-
-        object_class->finalize = gdm_xdmcp_greeter_display_finalize;
-        display_class->finish = gdm_xdmcp_greeter_display_finish;
-
-        g_type_class_add_private (klass, sizeof (GdmXdmcpGreeterDisplayPrivate));
 }
 
 static void
 gdm_xdmcp_greeter_display_init (GdmXdmcpGreeterDisplay *xdmcp_greeter_display)
 {
-
-        xdmcp_greeter_display->priv = GDM_XDMCP_GREETER_DISPLAY_GET_PRIVATE (xdmcp_greeter_display);
-}
-
-static void
-gdm_xdmcp_greeter_display_finalize (GObject *object)
-{
-        GdmXdmcpGreeterDisplay *xdmcp_greeter_display;
-
-        g_return_if_fail (object != NULL);
-        g_return_if_fail (GDM_IS_XDMCP_GREETER_DISPLAY (object));
-
-        xdmcp_greeter_display = GDM_XDMCP_GREETER_DISPLAY (object);
-
-        g_return_if_fail (xdmcp_greeter_display->priv != NULL);
-
-        G_OBJECT_CLASS (gdm_xdmcp_greeter_display_parent_class)->finalize (object);
-}
-
-static gboolean
-gdm_xdmcp_greeter_display_finish (GdmDisplay *display)
-{
-        g_return_val_if_fail (GDM_IS_DISPLAY (display), FALSE);
-
-        GDM_DISPLAY_CLASS (gdm_xdmcp_greeter_display_parent_class)->finish (display);
-
-        gdm_display_unmanage (display);
-
-        return TRUE;
 }
 
 GdmDisplay *


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]