Merge in X module renaming changes

[sojka/lightdm.git] / src / seat-xremote.c

diff --git a/src/seat-xremote.c b/src/seat-xremote.c
index f4452b65fcbf43dec1819e3916c662b5319ed867..0e60717fa7686cc61e4f5f08632bbe3ea80d618b 100644 (file)
--- a/src/seat-xremote.c
+++ b/src/seat-xremote.c
@@ -13,7 +13,7 @@
 
 #include "seat-xremote.h"
 #include "configuration.h"
-#include "xserver-remote.h"
+#include "x-server-remote.h"
 
 G_DEFINE_TYPE (SeatXRemote, seat_xremote, SEAT_TYPE);
 
@@ -27,7 +27,7 @@ seat_xremote_setup (Seat *seat)
 static DisplayServer *
 seat_xremote_create_display_server (Seat *seat, const gchar *session_type)
 {
-    XServerRemote *xserver;
+    XServerRemote *x_server;
     const gchar *hostname;
     gint number;
 
@@ -44,9 +44,9 @@ seat_xremote_create_display_server (Seat *seat, const gchar *session_type)
 
     g_debug ("Starting remote X display %s:%d", hostname, number);
 
-    xserver = xserver_remote_new (hostname, number, NULL);
+    x_server = x_server_remote_new (hostname, number, NULL);
 
-    return DISPLAY_SERVER (xserver);
+    return DISPLAY_SERVER (x_server);
 }
 
 static Greeter *
@@ -74,11 +74,11 @@ seat_xremote_create_session (Seat *seat)
 static void
 seat_xremote_run_script (Seat *seat, DisplayServer *display_server, Process *script)
 {
-    XServerRemote *xserver;
+    XServerRemote *x_server;
 
-    xserver = XSERVER_REMOTE (display_server);
-    process_set_env (script, "DISPLAY", xserver_get_address (XSERVER (xserver)));  
-    process_set_env (script, "REMOTE_HOST", xserver_get_hostname (XSERVER (xserver)));
+    x_server = X_SERVER_REMOTE (display_server);
+    process_set_env (script, "DISPLAY", x_server_get_address (X_SERVER (x_server)));  
+    process_set_env (script, "REMOTE_HOST", x_server_get_hostname (X_SERVER (x_server)));
 
     SEAT_CLASS (seat_xremote_parent_class)->run_script (seat, display_server, script);
 }