[gdm/wip/slave-display-merger: 29/29] wip: move GdmServer to GdmLocalDisplay

[Ray Strode <halfline src gnome org>]

commit 210c2029011b6bfecfaa7d216b779c70cee22b21
Author: Ray Strode <rstrode redhat com>
Date:   Tue Feb 3 17:13:51 2015 -0500

    wip: move GdmServer to GdmLocalDisplay
    
    When this commit is finished, GdmSimpleSlave will be gutted.
    We still need to move some code from gdm-slave.c to gdm-display.c
    and also deal with the chooser slave.
    
    Then we can drop the slave code completely (what an awful name),
    and then drop GdmServer in favor gdm-x-session from the
    xserver-in-session branch.

 daemon/gdm-local-display.c |    3 +++
 daemon/gdm-simple-slave.c  |    3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/daemon/gdm-local-display.c b/daemon/gdm-local-display.c
index caaf304..c022a48 100644
--- a/daemon/gdm-local-display.c
+++ b/daemon/gdm-local-display.c
@@ -46,6 +46,9 @@
 struct GdmLocalDisplayPrivate
 {
         GdmDBusLocalDisplay *skeleton;
+
+        GdmServer           *server;
+        guint                connection_attempts;
 };
 
 static void     gdm_local_display_class_init   (GdmLocalDisplayClass *klass);
diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c
index 2bab7be..9a582fd 100644
--- a/daemon/gdm-simple-slave.c
+++ b/daemon/gdm-simple-slave.c
@@ -61,9 +61,6 @@
 
 struct GdmSimpleSlavePrivate
 {
-        guint              connection_attempts;
-
-        GdmServer         *server;
 };
 
 enum {