119
120
GError *error = NULL;
121
122
directory = g_dir_open (sessions_dir, 0, &error);
123
if (error && !g_error_matches (error, G_FILE_ERROR, G_FILE_ERROR_NOENT))
123
124
g_warning ("Failed to open sessions directory: %s", error->message);
124
125
g_clear_error (&error);
205
203
remote_sessions_dir = g_strdup (REMOTE_SESSIONS_DIR);
207
205
/* Use session directory from configuration */
208
/* FIXME: This should be sent in the greeter connection */
209
config_path = g_build_filename (CONFIG_DIR, "lightdm.conf", NULL);
210
config_key_file = g_key_file_new ();
211
result = g_key_file_load_from_file (config_key_file, config_path, G_KEY_FILE_NONE, &error);
213
g_warning ("Failed to open configuration file: %s", error->message);
214
g_clear_error (&error);
206
config_load_from_standard_locations (config_get_instance (), NULL, NULL);
219
value = g_key_file_get_string (config_key_file, "LightDM", "sessions-directory", NULL);
222
g_free (sessions_dir);
223
sessions_dir = value;
208
value = config_get_string (config_get_instance (), "LightDM", "sessions-directory");
211
g_free (sessions_dir);
212
sessions_dir = value;
226
value = g_key_file_get_string (config_key_file, "LightDM", "remote-sessions-directory", NULL);
229
g_free (remote_sessions_dir);
230
remote_sessions_dir = value;
215
value = config_get_string (config_get_instance (), "LightDM", "remote-sessions-directory");
218
g_free (remote_sessions_dir);
219
remote_sessions_dir = value;
233
g_key_file_free (config_key_file);
234
g_free (config_path);
236
222
local_sessions = load_sessions (sessions_dir);
237
223
remote_sessions = load_sessions (remote_sessions_dir);