summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Cameron <brian.cameron@sun.com>2008-05-02 17:43:21 +0000
committerBrian Cameron <bcameron@src.gnome.org>2008-05-02 17:43:21 +0000
commit64b4f525599ca1d7addab28b0c5b918d2eebe9f2 (patch)
tree376a2aaaafcfeae3ce63fc1de9459e76c2f2aed6
parent2d0874d466068771fe4f4e1b115ca5790168e358 (diff)
downloadgdm-64b4f525599ca1d7addab28b0c5b918d2eebe9f2.tar.gz
Reverse last change. It seemed to work when I first tested it, but I must
2008-05-02 Brian Cameron <brian.cameron@sun.com> * daemon/gdm-daemon-config.c: Reverse last change. It seemed to work when I first tested it, but I must have tested it wrong. svn path=/branches/gnome-2-20/; revision=6209
-rw-r--r--ChangeLog5
-rw-r--r--daemon/gdm-daemon-config.c3
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 869ae3a8..d2b84541 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2008-05-02 Brian Cameron <brian.cameron@sun.com>
+ * daemon/gdm-daemon-config.c: Reverse last change. It seemed to
+ work when I first tested it, but I must have tested it wrong.
+
+2008-05-02 Brian Cameron <brian.cameron@sun.com>
+
* daemon/gdm-daemon-config.c: Remove call to gdm_config_load from
gdm_daemon_config_update_key. This function is only called when
the UPDATE_KEY message is passed to the daemon, which is typically
diff --git a/daemon/gdm-daemon-config.c b/daemon/gdm-daemon-config.c
index c3662603..0b3c92dc 100644
--- a/daemon/gdm-daemon-config.c
+++ b/daemon/gdm-daemon-config.c
@@ -1272,6 +1272,9 @@ gdm_daemon_config_update_key (const char *keystring)
return FALSE;
}
+ /* reload backend files if necessary */
+ gdm_config_load (daemon_config, NULL);
+
/* Shortcut for updating all XDMCP parameters */
if (is_key (keystring, "xdmcp/PARAMETERS")) {
rc = gdm_daemon_config_update_key (GDM_KEY_DISPLAYS_PER_HOST);