summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Cameron <brian.cameron@sun.com>2006-04-13 22:09:49 +0000
committerBrian Cameron <bcameron@src.gnome.org>2006-04-13 22:09:49 +0000
commit9e0288f545ef360fbf689ac16a82e390c1e71de9 (patch)
tree5df5c49b13027ea0c85e2d98733d27f2c1c3b18a
parentb453979939fbb93f3871f21d330375df8eb1c669 (diff)
downloadgdm-9e0288f545ef360fbf689ac16a82e390c1e71de9.tar.gz
Updated NEWS. Fix references to the BROADCAST key so it is correctly
2006-04-13 Brian Cameron <brian.cameron@sun.com> * NEWS: Updated NEWS. * gui/gdmchooser.c: Fix references to the BROADCAST key so it is correctly listed as a bool, not a string.
-rw-r--r--ChangeLog6
-rw-r--r--NEWS2
-rw-r--r--gui/gdmchooser.c4
3 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 44dbdc00..910b21ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-13 Brian Cameron <brian.cameron@sun.com>
+
+ * NEWS: Updated NEWS.
+ * gui/gdmchooser.c: Fix references to the BROADCAST key so it
+ is correctly listed as a bool, not a string.
+
2006-04-11 Brian Cameron <brian.cameron@sun.com>
* gui/greeter/Makefile.am: Now include gdmthemetester.in
diff --git a/NEWS b/NEWS
index 0b5e1a15..2ecdc555 100644
--- a/NEWS
+++ b/NEWS
@@ -553,7 +553,7 @@ Other Changes:
avoiding a race. (Simon Bowden/Brian Cameron)
- Define SoundProgram to be /usr/bin/autoplay on Solaris instead of
- /usr/bin/play, since /usr/bin/play doesn't exist on Solaris.
+ /usr/bin/play, since /usr/bin/autoplay doesn't exist on Solaris.
- Check for XInput fixed in configure and add a check for libgen.h to avoid
compiler warnings. (Brian Cameron)
diff --git a/gui/gdmchooser.c b/gui/gdmchooser.c
index 24c8ef20..5a5deaff 100644
--- a/gui/gdmchooser.c
+++ b/gui/gdmchooser.c
@@ -1791,7 +1791,6 @@ gdm_read_config (void)
gdm_config_get_string (GDM_KEY_DEFAULT_HOST_IMG);
gdm_config_get_string (GDM_KEY_HOST_IMAGE_DIR);
gdm_config_get_string (GDM_KEY_MULTICAST_ADDR);
- gdm_config_get_string (GDM_KEY_BROADCAST);
gdm_config_get_string (GDM_KEY_BACKGROUND_COLOR);
gdm_config_get_int (GDM_KEY_XINERAMA_SCREEN);
gdm_config_get_int (GDM_KEY_MAX_ICON_WIDTH);
@@ -1799,6 +1798,7 @@ gdm_read_config (void)
gdm_config_get_int (GDM_KEY_SCAN_TIME);
gdm_config_get_int (GDM_KEY_BACKGROUND_TYPE);
gdm_config_get_bool (GDM_KEY_ALLOW_ADD);
+ gdm_config_get_bool (GDM_KEY_BROADCAST);
gdm_config_get_bool (GDM_KEY_MULTICAST);
gdmcomm_comm_bulk_stop ();
@@ -1824,12 +1824,12 @@ gdm_reread_config (int sig, gpointer data)
gdm_config_reload_string (GDM_KEY_DEFAULT_HOST_IMG) ||
gdm_config_reload_string (GDM_KEY_HOST_IMAGE_DIR) ||
gdm_config_reload_string (GDM_KEY_MULTICAST_ADDR) ||
- gdm_config_reload_string (GDM_KEY_BROADCAST) ||
gdm_config_reload_int (GDM_KEY_XINERAMA_SCREEN) ||
gdm_config_reload_int (GDM_KEY_MAX_ICON_WIDTH) ||
gdm_config_reload_int (GDM_KEY_MAX_ICON_HEIGHT) ||
gdm_config_reload_int (GDM_KEY_SCAN_TIME) ||
gdm_config_reload_bool (GDM_KEY_ALLOW_ADD) ||
+ gdm_config_reload_bool (GDM_KEY_BROADCAST) ||
gdm_config_reload_bool (GDM_KEY_MULTICAST)) {
if (RUNNING_UNDER_GDM) {