Merge in X module renaming changes

1 files changed, 15 insertions, 15 deletions

diff --git a/src/seat-xlocal.c b/src/seat-xlocal.c
index d658f51a..3599c53d 100644
--- a/src/seat-xlocal.c
+++ b/src/seat-xlocal.c
@@ -13,7 +13,7 @@
 
 #include "seat-xlocal.h"
 #include "configuration.h"
-#include "xserver-local.h"
+#include "x-server-local.h"
 #include "mir-server.h"
 #include "vt.h"
 
@@ -36,14 +36,14 @@ seat_xlocal_setup (Seat *seat)
 static DisplayServer *
 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;
 
     g_debug ("Starting local X display");
   
-    xserver = xserver_local_new ();
+    x_server = x_server_local_new ();
 
     /* If running inside an X server use Xephyr instead */
     if (g_getenv ("DISPLAY"))
@@ -51,26 +51,26 @@ create_x_server (Seat *seat)
     if (!command)
         command = seat_get_string_property (seat, "xserver-command");
     if (command)
-        xserver_local_set_command (xserver, command);
+        x_server_local_set_command (x_server, command);
 
     layout = seat_get_string_property (seat, "xserver-layout");
     if (layout)
-        xserver_local_set_layout (xserver, layout);
+        x_server_local_set_layout (x_server, layout);
 
     config_file = seat_get_string_property (seat, "xserver-config");
     if (config_file)
-        xserver_local_set_config (xserver, config_file);
+        x_server_local_set_config (x_server, config_file);
   
     allow_tcp = seat_get_boolean_property (seat, "xserver-allow-tcp");
-    xserver_local_set_allow_tcp (xserver, allow_tcp);    
+    x_server_local_set_allow_tcp (x_server, allow_tcp);    
 
     xdmcp_manager = seat_get_string_property (seat, "xdmcp-manager");
     if (xdmcp_manager)
-        xserver_local_set_xdmcp_server (xserver, xdmcp_manager);
+        x_server_local_set_xdmcp_server (x_server, xdmcp_manager);
 
     port = seat_get_integer_property (seat, "xdmcp-port");
     if (port > 0)
-        xserver_local_set_xdmcp_port (xserver, port);
+        x_server_local_set_xdmcp_port (x_server, port);
 
     key_name = seat_get_string_property (seat, "xdmcp-key");
     if (key_name)
@@ -100,7 +100,7 @@ create_x_server (Seat *seat)
                 g_debug ("Key %s not defined", key_name);
 
             if (key)
-                xserver_local_set_xdmcp_key (xserver, key);
+                x_server_local_set_xdmcp_key (x_server, key);
             g_free (key);
         }
 
@@ -108,7 +108,7 @@ create_x_server (Seat *seat)
         g_key_file_free (keys);
     }
 
-    return DISPLAY_SERVER (xserver);
+    return DISPLAY_SERVER (x_server);
 }
 
 static DisplayServer *
@@ -181,11 +181,11 @@ static void
 seat_xlocal_run_script (Seat *seat, DisplayServer *display_server, Process *script)
 {
     const gchar *path;
-    XServerLocal *xserver;
+    XServerLocal *x_server;
 
-    xserver = XSERVER_LOCAL (display_server);
-    path = xserver_local_get_authority_file_path (xserver);
-    process_set_env (script, "DISPLAY", xserver_get_address (XSERVER (xserver)));
+    x_server = X_SERVER_LOCAL (display_server);
+    path = x_server_local_get_authority_file_path (x_server);
+    process_set_env (script, "DISPLAY", x_server_get_address (X_SERVER (x_server)));
     process_set_env (script, "XAUTHORITY", path);
 
     SEAT_CLASS (seat_xlocal_parent_class)->run_script (seat, display_server, script);