diff options
| author | Sam Yates <> | 2012-06-13 15:53:38 -0600 |
|---|---|---|
| committer | Matthew Fischer <matthew.fischer@canonical.com> | 2012-06-13 15:53:38 -0600 |
| commit | 0c45755134f06f7098f6576a09a718c1d2e6d50d (patch) | |
| tree | abbc99d4837e3e2dfcedbe336d9624c9f6397c9a /liblightdm-gobject | |
| parent | 50b8912297a3f7bf09dccf06c1e13944cf3a70f7 (diff) | |
| download | lightdm-git-0c45755134f06f7098f6576a09a718c1d2e6d50d.tar.gz | |
fixes 920150 for liblightdm-gobject by reading xsessions-directory from the conf file
Diffstat (limited to 'liblightdm-gobject')
| -rw-r--r-- | liblightdm-gobject/Makefile.am | 1 | ||||
| -rw-r--r-- | liblightdm-gobject/session.c | 31 |
2 files changed, 29 insertions, 3 deletions
diff --git a/liblightdm-gobject/Makefile.am b/liblightdm-gobject/Makefile.am index 93f190b8..8c0ce526 100644 --- a/liblightdm-gobject/Makefile.am +++ b/liblightdm-gobject/Makefile.am @@ -4,6 +4,7 @@ liblightdm_gobject_1_la_LDFLAGS = -export-symbols-regex \^lightdm_.* liblightdm_gobject_1_la_LIBADD = $(LIBLIGHTDM_GOBJECT_LIBS) liblightdm_gobject_1_la_CFLAGS = $(LIBLIGHTDM_GOBJECT_CFLAGS) \ $(WARN_CFLAGS) \ + -DCONFIG_DIR=\"$(sysconfdir)/lightdm\" \ -DXSESSIONS_DIR=\"$(datadir)/xsessions\" mainheader_HEADERS = lightdm.h diff --git a/liblightdm-gobject/session.c b/liblightdm-gobject/session.c index 7eb33373..082cc337 100644 --- a/liblightdm-gobject/session.c +++ b/liblightdm-gobject/session.c @@ -112,15 +112,39 @@ update_sessions (void) GDir *directory; GError *error = NULL; + GKeyFile *config_key_file = NULL; + gchar *config_path = NULL; + gchar *xsessions_dir = g_strdup (XSESSIONS_DIR); + if (have_sessions) return; - directory = g_dir_open (XSESSIONS_DIR, 0, &error); + config_path = g_build_filename (CONFIG_DIR, "lightdm.conf", NULL); + config_key_file = g_key_file_new (); + if (!g_key_file_load_from_file (config_key_file, config_path, G_KEY_FILE_NONE, &error)) { + if (error) { + g_warning ("Failed to open configuration file: %s", error->message); + g_clear_error (&error); + } + } + else { + gchar *xd_value = g_key_file_get_string (config_key_file, "LightDM", "xsessions-directory", NULL); + if (xd_value) { + g_free (xsessions_dir); + xsessions_dir = xd_value; + } + } + g_key_file_free (config_key_file); + g_free (config_path); + + directory = g_dir_open (xsessions_dir, 0, &error); if (error) g_warning ("Failed to open sessions directory: %s", error->message); g_clear_error (&error); - if (!directory) + if (!directory) { + g_free (xsessions_dir); return; + } while (TRUE) { @@ -136,7 +160,7 @@ update_sessions (void) if (!g_str_has_suffix (filename, ".desktop")) continue; - path = g_build_filename (XSESSIONS_DIR, filename, NULL); + path = g_build_filename (xsessions_dir, filename, NULL); key_file = g_key_file_new (); result = g_key_file_load_from_file (key_file, path, G_KEY_FILE_NONE, &error); @@ -163,6 +187,7 @@ update_sessions (void) } g_dir_close (directory); + g_free (xsessions_dir); have_sessions = TRUE; } |