diff options
| author | Robert Ancell <robert.ancell@canonical.com> | 2012-08-27 11:38:05 +1200 |
|---|---|---|
| committer | Robert Ancell <robert.ancell@canonical.com> | 2012-08-27 11:38:05 +1200 |
| commit | 1c62f4b3e37496f335e11057e05a8dfd72882a42 (patch) | |
| tree | fac8d5ab01609392ea4168ba217bd14a3d986a3b | |
| parent | 39c12004b151f73524ca69f18289038170d1b811 (diff) | |
| download | lightdm-1c62f4b3e37496f335e11057e05a8dfd72882a42.tar.gz | |
Update default config to have remote-sessions-directory and check this in liblightdm
| -rw-r--r-- | data/lightdm.conf | 2 | ||||
| -rw-r--r-- | liblightdm-gobject/session.c | 15 |
2 files changed, 14 insertions, 3 deletions
diff --git a/data/lightdm.conf b/data/lightdm.conf index f3b7d353..c98446f9 100644 --- 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 c91fea09..608c63bf 100644 --- 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); |