summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Cameron <Brian.Cameron@sun.com>2005-10-04 20:30:28 +0000
committerBrian Cameron <bcameron@src.gnome.org>2005-10-04 20:30:28 +0000
commit9a2e5b1c4c38366593b8efd85df6acdaf86b02d9 (patch)
tree12e7f413d4604bec36c45fdcd9a15f477818bd9f
parentbcde4a806e75c192e9143c72e8057c77379e17ab (diff)
downloadgdm-9a2e5b1c4c38366593b8efd85df6acdaf86b02d9.tar.gz
Correct reading of config file. Fixes bug #313701. Patch provided by
2005-10-04 Brian Cameron <Brian.Cameron@sun.com> * gui/gdmflexiserver.c: Correct reading of config file. Fixes bug #313701. Patch provided by Christiaan Welvaart <cjw@daneel.dyndns.org>.
-rw-r--r--ChangeLog7
-rw-r--r--gui/gdmflexiserver.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0b63ae76..f792d3f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-10-04 Brian Cameron <Brian.Cameron@sun.com>
+
+ * gui/gdmflexiserver.c: Correct reading of
+ config file. Fixes bug #313701. Patch
+ provided by Christiaan Welvaart
+ <cjw@daneel.dyndns.org>.
+
2005-10-03 Brian Cameron <Brian.Cameron@sun.com>
* Release 2.8.0.5.
diff --git a/gui/gdmflexiserver.c b/gui/gdmflexiserver.c
index 0e3ad781..e00793c1 100644
--- a/gui/gdmflexiserver.c
+++ b/gui/gdmflexiserver.c
@@ -545,7 +545,7 @@ read_servers (gchar *config_file)
char *section;
GdmXServer *svr;
- section = g_strdup_printf ("=%s=/", config_file);
+ section = g_strdup_printf ("=%s=/%s/", config_file, k);
gnome_config_push_prefix (section);
if ( ! gnome_config_get_bool