Merge in X module renaming changes

diff --cc src/Makefile.am
index 82bf2c1823c1118cb9d5dedbe0d5c086691ca961,4675a02d5a79a5a94d12e5e9fa159bc5b0d9bc55..1be9a5d7177df5db2e54ef0a7b636005a4b04f00
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -50,8 -46,20 +50,16 @@@ lightdm_SOURCES = 
        vnc-server.h \
        vt.c \
        vt.h \
-       xauthority.c \
-       xauthority.h \
+       x-authority.c \
+       x-authority.h \
 -      x-greeter.c \
 -      x-greeter.h \
+       x-server-local.c \
+       x-server-local.h \
+       x-server-remote.c \
+       x-server-remote.h \
+       x-server-xvnc.c \
+       x-server-xvnc.h \
+       x-server.c \
+       x-server.h \
 -      x-session.c \
 -      x-session.h \
        xdmcp-protocol.c \
        xdmcp-protocol.h \
        xdmcp-server.c \

diff --cc src/seat-unity.c
index 360ce2b4d0a799f9a8b27d801e6034a2aae71e20,a2abf3496a40c61149327c2207cd910e76c1d35c..766faceef8393a11e6f9bf3714a42df3c65206d2
--- 1/src/seat-unity.c
--- 2/src/seat-unity.c
+++ b/src/seat-unity.c
@@@ -16,8 -16,9 +16,8 @@@
  
  #include "seat-unity.h"
  #include "configuration.h"
- #include "xserver-local.h"
+ #include "x-server-local.h"
 -#include "x-greeter.h"
 -#include "x-session.h"
 +#include "mir-server.h"
  #include "vt.h"
  #include "plymouth.h"
  
@@@ -395,9 -390,9 +395,9 @@@ seat_unity_start (Seat *seat
  }
  
  static DisplayServer *
 -seat_unity_create_display_server (Seat *seat)
 +create_x_server (Seat *seat)
  {
-     XServerLocal *xserver;
+     XServerLocal *x_server;
      const gchar *command = NULL, *layout = NULL, *config_file = NULL, *xdmcp_manager = NULL, *key_name = NULL;
      gboolean allow_tcp;
      gint port = 0;
@@@ -475,23 -470,9 +475,23 @@@
          g_key_file_free (keys);
      }
  
-     return DISPLAY_SERVER (xserver);
+     return DISPLAY_SERVER (x_server);
  }
  
 +static DisplayServer *
 +seat_unity_create_display_server (Seat *seat, const gchar *session_type)
 +{  
 +    if (strcmp (session_type, "x") == 0)
 +        return create_x_server (seat);
 +    else if (strcmp (session_type, "mir") == 0)
 +        return DISPLAY_SERVER (mir_server_new ());
 +    else
 +    {
 +        g_warning ("Can't create unsupported display server '%s'", session_type);
 +        return NULL;
 +    }
 +}
 +
  static Greeter *
  seat_unity_create_greeter_session (Seat *seat)
  {

diff --cc src/seat-xdmcp-session.c
index 66b482a7aebc38d76493e4c632b5bc9e69ed0d46,479aad6f3bd4b7ff6b266e50c12fd2069a991a0a..b4b268555c7cc8c5e92cc0c8be0239ba6fcbe507
--- 1/src/seat-xdmcp-session.c
--- 2/src/seat-xdmcp-session.c
+++ b/src/seat-xdmcp-session.c
@@@ -12,7 -12,9 +12,7 @@@
  #include <string.h>
  
  #include "seat-xdmcp-session.h"
- #include "xserver-remote.h"
+ #include "x-server-remote.h"
 -#include "x-greeter.h"
 -#include "x-session.h"
  
  struct SeatXDMCPSessionPrivate
  {
@@@ -38,22 -40,28 +38,22 @@@ seat_xdmcp_session_create_display_serve
  {
      XAuthority *authority;
      gchar *host;
-     XServerRemote *xserver;
+     XServerRemote *x_server;
  
 +    if (strcmp (session_type, "x") != 0)
 +    {
 +        g_warning ("XDMCP seat only supports X display servers, not '%s'", session_type);
 +        return NULL;
 +    }
 +
      authority = xdmcp_session_get_authority (SEAT_XDMCP_SESSION (seat)->priv->session);
      host = g_inet_address_to_string (xdmcp_session_get_address (SEAT_XDMCP_SESSION (seat)->priv->session));
-     xserver = xserver_remote_new (host, xdmcp_session_get_display_number (SEAT_XDMCP_SESSION (seat)->priv->session), authority);
+     x_server = x_server_remote_new (host, xdmcp_session_get_display_number (SEAT_XDMCP_SESSION (seat)->priv->session), authority);
      g_free (host);
  
-     return DISPLAY_SERVER (xserver);
+     return DISPLAY_SERVER (x_server);
  }
  
 -static Greeter *
 -seat_xdmcp_session_create_greeter_session (Seat *seat)
 -{
 -    return GREETER (x_greeter_new ());
 -}
 -
 -static Session *
 -seat_xdmcp_session_create_session (Seat *seat)
 -{
 -    return SESSION (x_session_new ());
 -}
 -
  static void
  seat_xdmcp_session_init (SeatXDMCPSession *seat)
  {

diff --cc src/seat-xlocal.c
index d658f51a3ac29b6ab30a6a4dd64be3730b259dfc,f33607c20f8e3391bf42c64dd68e3ebaa2ec5489..3599c53d736b463f63a49daf9837e0eaea78d3a4
--- 1/src/seat-xlocal.c
--- 2/src/seat-xlocal.c
+++ b/src/seat-xlocal.c
@@@ -13,8 -13,9 +13,8 @@@
  
  #include "seat-xlocal.h"
  #include "configuration.h"
- #include "xserver-local.h"
+ #include "x-server-local.h"
 -#include "x-greeter.h"
 -#include "x-session.h"
 +#include "mir-server.h"
  #include "vt.h"
  
  G_DEFINE_TYPE (SeatXLocal, seat_xlocal, SEAT_TYPE);
@@@ -34,9 -29,9 +34,9 @@@ seat_xlocal_setup (Seat *seat
  }
  
  static DisplayServer *
 -seat_xlocal_create_display_server (Seat *seat)
 +create_x_server (Seat *seat)
  {
-     XServerLocal *xserver;
+     XServerLocal *x_server;
      const gchar *command = NULL, *layout = NULL, *config_file = NULL, *xdmcp_manager = NULL, *key_name = NULL;
      gboolean allow_tcp;
      gint port = 0;
@@@ -108,23 -103,9 +108,23 @@@
          g_key_file_free (keys);
      }
  
-     return DISPLAY_SERVER (xserver);
+     return DISPLAY_SERVER (x_server);
  }
  
 +static DisplayServer *
 +seat_xlocal_create_display_server (Seat *seat, const gchar *session_type)
 +{  
 +    if (strcmp (session_type, "x") == 0)
 +        return create_x_server (seat);
 +    else if (strcmp (session_type, "mir") == 0)
 +        return DISPLAY_SERVER (mir_server_new ());
 +    else
 +    {
 +        g_warning ("Can't create unsupported display server '%s'", session_type);
 +        return NULL;
 +    }
 +}
 +
  static Greeter *
  seat_xlocal_create_greeter_session (Seat *seat)
  {

diff --cc src/seat-xremote.c
index f4452b65fcbf43dec1819e3916c662b5319ed867,dcc356822bf985585cca2ce39d5ea95fb75125e5..0e60717fa7686cc61e4f5f08632bbe3ea80d618b
--- 1/src/seat-xremote.c
--- 2/src/seat-xremote.c
+++ b/src/seat-xremote.c
@@@ -13,7 -13,9 +13,7 @@@
  
  #include "seat-xremote.h"
  #include "configuration.h"
- #include "xserver-remote.h"
+ #include "x-server-remote.h"
 -#include "x-greeter.h"
 -#include "x-session.h"
  
  G_DEFINE_TYPE (SeatXRemote, seat_xremote, SEAT_TYPE);
  
@@@ -25,9 -27,9 +25,9 @@@ seat_xremote_setup (Seat *seat
  }
  
  static DisplayServer *
 -seat_xremote_create_display_server (Seat *seat)
 +seat_xremote_create_display_server (Seat *seat, const gchar *session_type)
  {
-     XServerRemote *xserver;
+     XServerRemote *x_server;
      const gchar *hostname;
      gint number;
  

diff --cc src/seat-xvnc.c
index b85d9e16a668c72f4a8d430d02e2406af0ba3254,f96b43556f88c76e0a954a6fea2b7854006151cd..2f4ecf7500fd4042e558dfbfe13723971a695664
--- 1/src/seat-xvnc.c
--- 2/src/seat-xvnc.c
+++ b/src/seat-xvnc.c
@@@ -9,10 -9,10 +9,10 @@@
   * license.
   */
  
 +#include <string.h>
 +
  #include "seat-xvnc.h"
- #include "xserver-xvnc.h"
+ #include "x-server-xvnc.h"
 -#include "x-greeter.h"
 -#include "x-session.h"
  #include "configuration.h"
  
  G_DEFINE_TYPE (SeatXVNC, seat_xvnc, SEAT_TYPE);
@@@ -34,19 -34,13 +34,19 @@@ SeatXVNC *seat_xvnc_new (GSocket *conne
  }
  
  static DisplayServer *
 -seat_xvnc_create_display_server (Seat *seat)
 +seat_xvnc_create_display_server (Seat *seat, const gchar *session_type)
  {
-     XServerXVNC *xserver;
+     XServerXVNC *x_server;
      const gchar *command = NULL;
  
-     xserver = xserver_xvnc_new ();
-     xserver_xvnc_set_socket (xserver, g_socket_get_fd (SEAT_XVNC (seat)->priv->connection));
 +    if (strcmp (session_type, "x") != 0)
 +    {
 +        g_warning ("XVNC seat only supports X display servers, not '%s'", session_type);
 +        return NULL;
 +    }
 +  
+     x_server = x_server_xvnc_new ();
+     x_server_xvnc_set_socket (x_server, g_socket_get_fd (SEAT_XVNC (seat)->priv->connection));
  
      command = config_get_string (config_get_instance (), "VNCServer", "command");
      if (command)
@@@ -66,12 -60,24 +66,12 @@@
          gint depth;
          depth = config_get_integer (config_get_instance (), "VNCServer", "depth");
          if (depth == 8 || depth == 16 || depth == 24 || depth == 32)
-             xserver_xvnc_set_depth (xserver, depth);
+             x_server_xvnc_set_depth (x_server, depth);
      }
  
-     return DISPLAY_SERVER (xserver);
+     return DISPLAY_SERVER (x_server);
  }
  
 -static Greeter *
 -seat_xvnc_create_greeter_session (Seat *seat)
 -{
 -    return GREETER (x_greeter_new ());
 -}
 -
 -static Session *
 -seat_xvnc_create_session (Seat *seat)
 -{
 -    return SESSION (x_session_new ());
 -}
 -
  static void
  seat_xvnc_run_script (Seat *seat, DisplayServer *display_server, Process *script)
  {

diff --cc src/session.c
Simple merge

diff --cc src/session.h
index d7c4b0c517d2f0130536c129ba93450c023fe265,f1cefb0899b9cc4b0d998ca4362e168016ec6541..0ac44c8b82a408fd42c761eb088a651fed388a20
--- 1/src/session.h
--- 2/src/session.h
+++ b/src/session.h
@@@ -16,11 -16,9 +16,11 @@@
  
  #include <security/pam_appl.h>
  
 +typedef struct Session Session;
 +
  #include "display-server.h"
  #include "accounts.h"
- #include "xauthority.h"
+ #include "x-authority.h"
  
  G_BEGIN_DECLS
  

diff --cc src/x-server-local.c
Simple merge

diff --cc src/x-server.c
index a465947ddd63176a9ce8cdf7b94da158235a0661,7a5d6da6389b6a38871a124df3e301f4975d0eeb..8bc14dc4868ad125d82acbfb7a9d25f46bcd2eac
--- 1/src/xserver.c
--- 2/src/x-server.c
+++ b/src/x-server.c
@@@ -13,8 -13,8 +13,8 @@@
  #include <string.h>
  #include <xcb/xcb.h>
  
- #include "xserver.h"
+ #include "x-server.h"
 -#include "x-session.h"
 +#include "configuration.h"
  
  struct XServerPrivate
  {  
@@@ -133,39 -133,9 +133,39 @@@ x_server_start (DisplayServer *display_
  }
  
  static void
- xserver_setup_session (DisplayServer *display_server, Session *session)
++x_server_setup_session (DisplayServer *display_server, Session *session)
 +{
 +    gint vt;
 +
 +    display_server = session_get_display_server (session);
 +
 +    vt = display_server_get_vt (display_server);
 +    if (vt > 0)
 +    {
 +        gchar *t;
 +
 +        t = g_strdup_printf ("/dev/tty%d", vt);
 +        session_set_tty (session, t);
 +        g_free (t);
 +
 +        t = g_strdup_printf ("%d", vt);
 +        session_set_env (session, "XDG_VTNR", t);
 +        g_free (t);
 +    }
 +
-     session_set_env (session, "DISPLAY", xserver_get_address (XSERVER (display_server)));
-     session_set_tty (session, xserver_get_address (XSERVER (display_server)));
-     session_set_xdisplay (session, xserver_get_address (XSERVER (display_server)));
-     session_set_remote_host_name (session, xserver_get_hostname (XSERVER (display_server)));
-     session_set_xauthority (session,
-                             xserver_get_authority (XSERVER (display_server)),
-                             config_get_boolean (config_get_instance (), "LightDM", "user-authority-in-system-dir"));
++    session_set_env (session, "DISPLAY", x_server_get_address (X_SERVER (display_server)));
++    session_set_tty (session, x_server_get_address (X_SERVER (display_server)));
++    session_set_xdisplay (session, x_server_get_address (X_SERVER (display_server)));
++    session_set_remote_host_name (session, x_server_get_hostname (X_SERVER (display_server)));
++    session_set_x_authority (session,
++                             x_server_get_authority (X_SERVER (display_server)),
++                             config_get_boolean (config_get_instance (), "LightDM", "user-authority-in-system-dir"));
 +}
 +
- static void
- xserver_init (XServer *server)
++void
+ x_server_init (XServer *server)
  {
-     server->priv = G_TYPE_INSTANCE_GET_PRIVATE (server, XSERVER_TYPE, XServerPrivate);
+     server->priv = G_TYPE_INSTANCE_GET_PRIVATE (server, X_SERVER_TYPE, XServerPrivate);
  }
  
  static void
@@@ -191,9 -161,8 +191,9 @@@ x_server_class_init (XServerClass *klas
      GObjectClass *object_class = G_OBJECT_CLASS (klass);
      DisplayServerClass *display_server_class = DISPLAY_SERVER_CLASS (klass);
  
-     display_server_class->start = xserver_start;
-     display_server_class->setup_session = xserver_setup_session;
-     object_class->finalize = xserver_finalize;
+     display_server_class->start = x_server_start;
++    display_server_class->setup_session = x_server_setup_session;
+     object_class->finalize = x_server_finalize;
  
      g_type_class_add_private (klass, sizeof (XServerPrivate));
  }