[gdm/wip/xserver-in-session: 34/54] display: drop base class implementation of manage vfunc



commit 9bdb5ad90d95a4125b2797fff234026b8f52b149
Author: Ray Strode <rstrode redhat com>
Date:   Mon Feb 16 08:52:05 2015 -0500

    display: drop base class implementation of manage vfunc
    
    All it does is set the managed state, which the subclasses
    can do just as easily, so cut out some code.

 daemon/gdm-display.c       |    7 -------
 daemon/gdm-xdmcp-display.c |    2 +-
 2 files changed, 1 insertions(+), 8 deletions(-)
---
diff --git a/daemon/gdm-display.c b/daemon/gdm-display.c
index 742532e..b206e88 100644
--- a/daemon/gdm-display.c
+++ b/daemon/gdm-display.c
@@ -607,12 +607,6 @@ _gdm_display_set_status (GdmDisplay *self,
         }
 }
 
-static void
-gdm_display_real_manage (GdmDisplay *self)
-{
-        _gdm_display_set_status (self, GDM_DISPLAY_MANAGED);
-}
-
 static gboolean
 gdm_display_real_prepare (GdmDisplay *self)
 {
@@ -1329,7 +1323,6 @@ gdm_display_class_init (GdmDisplayClass *klass)
         object_class->finalize = gdm_display_finalize;
 
         klass->prepare = gdm_display_real_prepare;
-        klass->manage = gdm_display_real_manage;
 
         g_object_class_install_property (object_class,
                                          PROP_ID,
diff --git a/daemon/gdm-xdmcp-display.c b/daemon/gdm-xdmcp-display.c
index 7241caf..be2f0d5 100644
--- a/daemon/gdm-xdmcp-display.c
+++ b/daemon/gdm-xdmcp-display.c
@@ -205,7 +205,7 @@ gdm_xdmcp_display_manage (GdmDisplay *display)
 
         g_timeout_add (500, (GSourceFunc)idle_connect_to_display, self);
 
-        GDM_DISPLAY_CLASS (gdm_xdmcp_display_parent_class)->manage (display);
+        g_object_set (G_OBJECT (self), "status", GDM_DISPLAY_MANAGED, NULL);
 }
 
 static void


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