Update default config to have remote-sessions-directory and check this in liblightdm

diff --git a/data/lightdm.conf b/data/lightdm.conf
index f3b7d3539c0992dfe5bdc4a6b17cb331fd463941..c98446f9e93717dd91af95ea76d9e875606cd001 100644 (file)
--- a/data/lightdm.conf
+++ b/data/lightdm.conf
@@ -12,6 +12,7 @@
 # run-directory = Directory to put running state in
 # cache-directory = Directory to cache to
 # xsessions-directory = Directory to find X sessions
+# remote-sessions-directory = Directory to find remote sessions
 # xgreeters-directory = Directory to find X greeters
 #
 [LightDM]
@@ -26,6 +27,7 @@
 #run-directory=/var/run/lightdm
 #cache-directory=/var/cache/lightdm
 #xsessions-directory=/usr/share/xsessions
+#remote-sessions-directory=/usr/share/lightdm/remote-sessions
 #xgreeters-directory=/usr/share/xgreeters
 
 #

diff --git a/liblightdm-gobject/session.c b/liblightdm-gobject/session.c
index c91fea093aac49256994733dab3c581edafc1bc4..608c63bf03ea6642a17e46ddaf75614d22250187 100644 (file)
--- a/liblightdm-gobject/session.c
+++ b/liblightdm-gobject/session.c
@@ -192,11 +192,20 @@ update_sessions (void)
     g_clear_error (&error);
     if (result)
     {
-        gchar *xd_value = g_key_file_get_string (config_key_file, "LightDM", "xsessions-directory", NULL);
-        if (xd_value)
+        gchar *value;
+      
+        value = g_key_file_get_string (config_key_file, "LightDM", "xsessions-directory", NULL);
+        if (value)
         {
             g_free (xsessions_dir);
-            xsessions_dir = xd_value;
+            xsessions_dir = value;
+        }
+
+        value = g_key_file_get_string (config_key_file, "LightDM", "remote-sessions-directory", NULL);
+        if (value)
+        {
+            g_free (remote_sessions_dir);
+            remote_sessions_dir = value;
         }
     }
     g_key_file_free (config_key_file);