summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Cameron <brian.cameron@sun.com>2007-05-10 04:41:32 +0000
committerBrian Cameron <bcameron@src.gnome.org>2007-05-10 04:41:32 +0000
commit9fb5e89da469e9b0d1aa8b378d058a3b45a87b8a (patch)
treea8df743ca210db0ab3f1205e7006ddd301e99f61
parent92d39385452ce4f51d6160190ad53aa1a9fe8ba5 (diff)
downloadgdm-9fb5e89da469e9b0d1aa8b378d058a3b45a87b8a.tar.gz
Oops, fix config call to work.
2007-05-10 Brian Cameron <brian.cameron@sun.com> * daemon/slave.c: Oops, fix config call to work. svn path=/branches/gnome-2-18/; revision=4910
-rw-r--r--ChangeLog4
-rw-r--r--daemon/slave.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 1b735faa..f5859253 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2007-05-10 Brian Cameron <brian.cameron@sun.com>
+ * daemon/slave.c: Oops, fix config call to work.
+
+2007-05-10 Brian Cameron <brian.cameron@sun.com>
+
* daemon/slave.c: Fix handling of AlwaysLoginCurrentSession and
DoubleLoginWarning so it works for the non-migratable case
(for Xnest, XDMCP, etc.). Fixes bug #172600.
diff --git a/daemon/slave.c b/daemon/slave.c
index 4cb2e38d..c794e3df 100644
--- a/daemon/slave.c
+++ b/daemon/slave.c
@@ -1144,7 +1144,7 @@ ask_migrate (const char *migrate_to)
* the dialog.
*/
if (migrate_to != NULL &&
- gdm_daemon_config_get_value_bool (GDM_KEY_ALWAYS_LOGIN_CURRENT_SESSION)) {
+ gdm_get_value_bool (GDM_KEY_ALWAYS_LOGIN_CURRENT_SESSION)) {
return 1;
}
@@ -1152,7 +1152,7 @@ ask_migrate (const char *migrate_to)
* Avoid dialog if DOUBLE_LOGIN_WARNING is false. In this case
* ALWAYS_LOGIN_CURRENT_SESSION is false, so assume new session.
*/
- if (!gdm_daemon_config_get_value_bool (GDM_KEY_DOUBLE_LOGIN_WARNING)) {
+ if (!gdm_get_value_bool (GDM_KEY_DOUBLE_LOGIN_WARNING)) {
return 0;
}