summaryrefslogtreecommitdiff
path: root/utils
diff options
context:
space:
mode:
authorBrian Cameron <brian.cameron@sun.com>2005-11-04 00:51:22 +0000
committerBrian Cameron <bcameron@src.gnome.org>2005-11-04 00:51:22 +0000
commit4d29395d657badd698e35c583f03ca8458499338 (patch)
treec0c891ce7bfccac64fefef17659e2a46adb48805 /utils
parentc8f039f50dca8b7e979d40947693a2640745a5cf (diff)
downloadgdm-4d29395d657badd698e35c583f03ca8458499338.tar.gz
Redesign of daemon configuraton. Now all vicious-extensions logic is in
2005-11-03 Brian Cameron <brian.cameron@sun.com> Redesign of daemon configuraton. Now all vicious-extensions logic is in gdmconfig.[ch]. This greatly simplifies how the UPDATE_CONFIG, and GET_CONFIG commands work and makes it easier to update the way GDM handles configuration. Changed ve_setenv/ve_unsetenv to g_setenv/g_unsetenv since GDM requires a newer version of GLIB than could possibly cause the old ve versions to get used. * daemon/gdmconfig.[ch]: New logic for interacting with vicious-extensions. * daemon/gdm.h: Updated comments and changed the #define for many configuration options so the naming is more consistant. Now the #defines more closely match the keys in gdm.conf and more consistantly use the underscore. * daemon/auth.c, daemon/choose.c, daemon/cookie.c, daemon/display.c, daemon/errorgui.c, daemon/gdm-net.c, daemon/gdm.c, daemon/getvt.c, daemon/misc.c, daemon/server.c, daemon/slave.c, daemon/verify-crypt.c, daemon/verify-pam.c, daemon/verify-shadow.c, daemon/xdmcp.c: Reorganized configuration. * daemon/auth.h, daemon/cookie.h, daemon/display.h, daemon/errorgui.h, daemon/filecheck.h, daemon/gdm-net.h, daemon/getvt.h, daemon/misc.h, daemon/server.h, daemon/slave.h, daemon/verify.h, daemon/xdmcp.h: Now include gdmconfig.h instead of vicious.h and changed "Gnome" to "GNOME" in comment. * daemon/Makefile.am: Added new gdmconfig.[ch] * gui/gdmXnestChooser.c, gui/gdmchooser.c, gui/gdmcomm.c, gui/gdmdynamic.c, gui/gdmflexiserver.c, gui/gdmlogin.c, gui/gdmphotosetup.c, gui/gdmsetup.c, gui/greeter/greeter.c, gui/greeter/greeter_item_capslock.c, utils/gdm-dmx-reconnect-proxy.c: Updated to reflect the new configuration #defines.
Diffstat (limited to 'utils')
-rw-r--r--utils/gdm-dmx-reconnect-proxy.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/utils/gdm-dmx-reconnect-proxy.c b/utils/gdm-dmx-reconnect-proxy.c
index 61a581c3..60ff683a 100644
--- a/utils/gdm-dmx-reconnect-proxy.c
+++ b/utils/gdm-dmx-reconnect-proxy.c
@@ -66,7 +66,7 @@ get_dmx_display (const char *display_name,
const char *old_authfile;
old_authfile = getenv ("XAUTHORITY");
- ve_setenv ("XAUTHORITY", authfile, TRUE);
+ g_setenv ("XAUTHORITY", authfile, TRUE);
if ((display = XOpenDisplay (display_name)) == NULL)
g_printerr (_("Failed to open display \"%s\"\n"), display_name);
@@ -78,7 +78,7 @@ get_dmx_display (const char *display_name,
display = NULL;
}
- ve_setenv ("XAUTHORITY", old_authfile, TRUE);
+ g_setenv ("XAUTHORITY", old_authfile, TRUE);
return display;
}