diff options
| author | Alberts Muktupāvels <alberts.muktupavels@gmail.com> | 2014-10-17 08:34:50 +0300 |
|---|---|---|
| committer | Alberts Muktupāvels <alberts.muktupavels@gmail.com> | 2014-10-17 08:34:50 +0300 |
| commit | 5dea421aaefa2579a753aabaef7d0d0dfa2e7c68 (patch) | |
| tree | f84213912cbe126918e5f239c779e2c9bda1d418 /src | |
| parent | 22d0669615c0aa98c42807f7c41fef82c0b0c934 (diff) | |
| download | lightdm-5dea421aaefa2579a753aabaef7d0d0dfa2e7c68.tar.gz | |
session-config: fix DesktopNames
Diffstat (limited to 'src')
| -rw-r--r-- | src/session-config.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/session-config.c b/src/session-config.c index f80e7e66..834c1a6d 100644 --- a/src/session-config.c +++ b/src/session-config.c @@ -34,6 +34,7 @@ session_config_new_from_file (const gchar *filename, GError **error) GKeyFile *desktop_file; SessionConfig *config; gchar *command; + gchar **desktop_names; desktop_file = g_key_file_new (); if (!g_key_file_load_from_file (desktop_file, filename, G_KEY_FILE_NONE, error)) @@ -54,7 +55,12 @@ session_config_new_from_file (const gchar *filename, GError **error) if (!config->priv->session_type) config->priv->session_type = g_strdup ("x"); - config->priv->desktop_name = g_key_file_get_string (desktop_file, G_KEY_FILE_DESKTOP_GROUP, "DesktopNames", NULL); + desktop_names = g_key_file_get_string_list (desktop_file, G_KEY_FILE_DESKTOP_GROUP, "DesktopNames", NULL, NULL); + if (desktop_names != NULL) + { + config->priv->desktop_name = g_strjoinv (":", desktop_names); + g_strfreev (desktop_names); + } if (!config->priv->desktop_name) config->priv->desktop_name = g_key_file_get_string (desktop_file, G_KEY_FILE_DESKTOP_GROUP, "X-LightDM-DesktopName", NULL); config->priv->compositor_command = g_key_file_get_string (desktop_file, G_KEY_FILE_DESKTOP_GROUP, "X-LightDM-System-Compositor-Command", NULL); @@ -96,6 +102,7 @@ static void session_config_init (SessionConfig *config) { config->priv = G_TYPE_INSTANCE_GET_PRIVATE (config, SESSION_CONFIG_TYPE, SessionConfigPrivate); + config->priv->desktop_name = NULL; } static void |