summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Cameron <brian.cameron@sun.com>2005-08-09 03:38:48 +0000
committerBrian Cameron <bcameron@src.gnome.org>2005-08-09 03:38:48 +0000
commitdce96d957fe061de1521a0341ac2518fea72dc59 (patch)
treec2fd08517f8d4b37b78af3c708a358fe06e34fcc
parent6bef3b7e14e8d0d6d56b79ff3b13c2fdf29e3445 (diff)
downloadgdm-dce96d957fe061de1521a0341ac2518fea72dc59.tar.gz
Fixed Multicast compile issue when IPv6 is not enabled.
2005-08-08 Brian Cameron <brian.cameron@sun.com> * daemon/gdm.c: Fixed Multicast compile issue when IPv6 is not enabled.
-rw-r--r--ChangeLog2
-rw-r--r--daemon/gdm.c4
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 8f3d6e7a..95ac2326 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
* NEWS: Updated
* gui/gdmsetup.glade: Fixed strings, refer to bugs
#312956, 312959, and 312960.
+ * daemon/gdm.c: Fixed Multicast compile issue when
+ IPv6 is not enabled.
2005-08-08 Brian Cameron <brian.cameron@sun.com>
diff --git a/daemon/gdm.c b/daemon/gdm.c
index cba4e774..dece5c39 100644
--- a/daemon/gdm.c
+++ b/daemon/gdm.c
@@ -4198,7 +4198,9 @@ gdm_handle_user_message (GdmConnection *conn, const char *msg, gpointer data)
!(print_defaultbool_if_key (cfg, conn, key, GDM_KEY_SYSMENU, &GdmSystemMenu)) &&
!(print_defaultbool_if_key (cfg, conn, key, GDM_KEY_CHOOSER_BUTTON, &GdmChooserButton)) &&
!(print_defaultbool_if_key (cfg, conn, key, GDM_KEY_BROWSER, &GdmBrowser)) &&
+#ifdef ENABLE_IPV6
!(print_defaultbool_if_key (cfg, conn, key, GDM_KEY_MULTICAST, &GdmMulticast)) &&
+#endif
!(print_defaultbool_if_key (cfg, conn, key, GDM_KEY_NEVERPLACECOOKIESONNFS, &GdmNeverPlaceCookiesOnNFS)) &&
!(print_defaultbool_if_key (cfg, conn, key, GDM_KEY_CONSOLE_NOTIFY, &GdmConsoleNotify)) &&
!(print_defaultbool_if_key (cfg, conn, key, GDM_KEY_TIMED_LOGIN_ENABLE, &GdmTimedLoginEnable)) &&
@@ -4260,7 +4262,9 @@ gdm_handle_user_message (GdmConnection *conn, const char *msg, gpointer data)
!(print_defaultstring_if_key (cfg, conn, key, GDM_KEY_UAUTHFILE, GdmUserAuthFile)) &&
!(print_defaultstring_if_key (cfg, conn, key, GDM_KEY_UAUTHFB, GdmUserAuthFB)) &&
!(print_defaultstring_if_key (cfg, conn, key, GDM_KEY_SESSDIR, GdmSessDir)) &&
+#ifdef ENABLE_IPV6
!(print_defaultstring_if_key (cfg, conn, key, GDM_KEY_MULTICAST_ADDR, GdmMulticastAddr)) &&
+#endif
!(print_defaultstring_if_key (cfg, conn, key, GDM_KEY_USER, GdmUser)) &&
!(print_defaultstring_if_key (cfg, conn, key, GDM_KEY_GROUP, GdmGroup)) &&
!(print_defaultstring_if_key (cfg, conn, key, GDM_KEY_GTKRC, GdmGtkRC)) &&