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.

1 files changed, 17 insertions, 17 deletions

diff --git a/gui/gdmchooser.c b/gui/gdmchooser.c
index 0951959e..886b9d4a 100644
--- a/gui/gdmchooser.c
+++ b/gui/gdmchooser.c
@@ -1607,24 +1607,24 @@ gdm_chooser_parse_config (void)
 
     cfg = ve_config_get (config_file);
 
-    GdmXineramaScreen = ve_config_get_int (cfg, GDM_KEY_XINERAMASCREEN);
+    GdmXineramaScreen = ve_config_get_int (cfg, GDM_KEY_XINERAMA_SCREEN);
     GdmGtkRC = ve_config_get_string (cfg, GDM_KEY_GTKRC);
     GdmGtkTheme = ve_config_get_string (cfg, GDM_KEY_GTK_THEME);
-    GdmScanTime = ve_config_get_int (cfg, GDM_KEY_SCAN);
-    GdmHostDefaultIcon = ve_config_get_string (cfg, GDM_KEY_HOST);
-    GdmHostIconDir = ve_config_get_string (cfg, GDM_KEY_HOSTDIR);
-    GdmIconMaxWidth = ve_config_get_int (cfg, GDM_KEY_ICONWIDTH);
-    GdmIconMaxHeight = ve_config_get_int (cfg, GDM_KEY_ICONHEIGHT);
+    GdmScanTime = ve_config_get_int (cfg, GDM_KEY_SCAN_TIME);
+    GdmHostDefaultIcon = ve_config_get_string (cfg, GDM_KEY_DEFAULT_HOST_IMG);
+    GdmHostIconDir = ve_config_get_string (cfg, GDM_KEY_HOST_IMAGE_DIR);
+    GdmIconMaxWidth = ve_config_get_int (cfg, GDM_KEY_ICON_WIDTH);
+    GdmIconMaxHeight = ve_config_get_int (cfg, GDM_KEY_ICON_HEIGHT);
     GdmDebug = ve_config_get_bool (cfg, GDM_KEY_DEBUG);
 
-    GdmBackgroundColor = ve_config_get_string (cfg, GDM_KEY_BACKGROUNDCOLOR);
-    GdmBackgroundType = ve_config_get_int (cfg, GDM_KEY_BACKGROUNDTYPE);
+    GdmBackgroundColor = ve_config_get_string (cfg, GDM_KEY_BACKGROUND_COLOR);
+    GdmBackgroundType = ve_config_get_int (cfg, GDM_KEY_BACKGROUND_TYPE);
 #ifdef ENABLE_IPV6
     GdmMulticast = ve_config_get_bool (cfg, GDM_KEY_MULTICAST);
     GdmMulticastAddr = ve_config_get_string (cfg, GDM_KEY_MULTICAST_ADDR);
 #endif
 
-    GdmAllowAdd = ve_config_get_bool (cfg, GDM_KEY_ALLOWADD);
+    GdmAllowAdd = ve_config_get_bool (cfg, GDM_KEY_ALLOW_ADD);
 
     /* note that command line arguments will prevail over these */
     GdmHosts = ve_config_get_string (cfg, GDM_KEY_HOSTS);
@@ -1901,13 +1901,13 @@ gdm_reread_config (int sig, gpointer data)
 	if ( ! string_same (config, GdmHostsOrig, GDM_KEY_HOSTS) ||
 	     ! string_same (config, GdmGtkRC, GDM_KEY_GTKRC) ||
 	     ! string_same (config, GdmGtkTheme, GDM_KEY_GTK_THEME) ||
-	     ! string_same (config, GdmHostDefaultIcon, GDM_KEY_HOST) ||
-	     ! string_same (config, GdmHostIconDir, GDM_KEY_HOSTDIR) ||
+	     ! string_same (config, GdmHostDefaultIcon, GDM_KEY_DEFAULT_HOST_IMG) ||
+	     ! string_same (config, GdmHostIconDir, GDM_KEY_HOST_IMAGE_DIR) ||
 	     ! int_same (config,
-			 GdmXineramaScreen, GDM_KEY_XINERAMASCREEN) ||
-	     ! int_same (config, GdmIconMaxWidth, GDM_KEY_ICONWIDTH) ||
-	     ! int_same (config, GdmIconMaxHeight, GDM_KEY_ICONHEIGHT) ||
-	     ! int_same (config, GdmScanTime, GDM_KEY_SCAN) ||
+			 GdmXineramaScreen, GDM_KEY_XINERAMA_SCREEN) ||
+	     ! int_same (config, GdmIconMaxWidth, GDM_KEY_ICON_WIDTH) ||
+	     ! int_same (config, GdmIconMaxHeight, GDM_KEY_ICON_HEIGHT) ||
+	     ! int_same (config, GdmScanTime, GDM_KEY_SCAN_TIME) ||
 	     ! bool_same (config, GdmDebug, GDM_KEY_DEBUG)) {
 		if (RUNNING_UNDER_GDM) {
 			/* Set busy cursor */
@@ -1922,8 +1922,8 @@ gdm_reread_config (int sig, gpointer data)
 	}
 
 	/* we only use the color and do it for all types except NONE */
-	if ( ! string_same (config, GdmBackgroundColor, GDM_KEY_BACKGROUNDCOLOR) ||
-	     ! int_same (config, GdmBackgroundType, GDM_KEY_BACKGROUNDTYPE)) {
+	if ( ! string_same (config, GdmBackgroundColor, GDM_KEY_BACKGROUND_COLOR) ||
+	     ! int_same (config, GdmBackgroundType, GDM_KEY_BACKGROUND_TYPE)) {
 
 		if (GdmBackgroundType != GDM_BACKGROUND_NONE) {
 			setup_background_color (GdmBackgroundColor);