summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRobert Ancell <robert.ancell@canonical.com>2014-09-08 15:09:39 +1200
committerRobert Ancell <robert.ancell@canonical.com>2014-09-08 15:09:39 +1200
commitac63f219d2a9825adb7e067308193cc8b13e0ee5 (patch)
treece40aa2e99d0b88f80963adbc8c4376bb3fcc4c9 /src
parentb733b647821c4306f4818101277444942baa0c38 (diff)
downloadlightdm-ac63f219d2a9825adb7e067308193cc8b13e0ee5.tar.gz
Fix variable scope
Diffstat (limited to 'src')
-rw-r--r--src/seat-unity.c6
-rw-r--r--src/seat-xlocal.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/src/seat-unity.c b/src/seat-unity.c
index df538b09..d08c2b23 100644
--- a/src/seat-unity.c
+++ b/src/seat-unity.c
@@ -380,11 +380,11 @@ seat_unity_set_next_session (Seat *seat, Session *session)
static void
seat_unity_run_script (Seat *seat, DisplayServer *display_server, Process *script)
{
- const gchar *path;
- XServerLocal *x_server;
-
if (IS_X_SERVER_LOCAL (display_server))
{
+ XServerLocal *x_server;
+ const gchar *path;
+
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)));
diff --git a/src/seat-xlocal.c b/src/seat-xlocal.c
index 9fa9f683..5ee32aab 100644
--- a/src/seat-xlocal.c
+++ b/src/seat-xlocal.c
@@ -340,11 +340,11 @@ seat_xlocal_get_active_session (Seat *seat)
static void
seat_xlocal_run_script (Seat *seat, DisplayServer *display_server, Process *script)
{
- const gchar *path;
- XServerLocal *x_server;
-
if (IS_X_SERVER_LOCAL (display_server))
{
+ const gchar *path;
+ XServerLocal *x_server;
+
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)));