no ned to make the config values optional on build

SVN revision: 21642

diff --git a/src/bin/e_config.c b/src/bin/e_config.c
index 3981699..6a340ce 100644 (file)
--- a/src/bin/e_config.c
+++ b/src/bin/e_config.c
@@ -460,9 +460,7 @@ e_config_init(void)
    E_CONFIG_VAL(D, T, font_hinting, INT);
    E_CONFIG_VAL(D, T, desklock_personal_passwd, STR);
    E_CONFIG_VAL(D, T, desklock_background, STR);
-#ifdef HAVE_PAM
    E_CONFIG_VAL(D, T, desklock_auth_method, INT);
-#endif
    E_CONFIG_VAL(D, T, desklock_login_box_zone, INT);
    E_CONFIG_VAL(D, T, desklock_autolock, INT);
    E_CONFIG_VAL(D, T, desklock_use_timeout, INT);
@@ -634,9 +632,7 @@ e_config_init(void)
    
    e_config->desklock_personal_passwd = NULL;
    e_config->desklock_background = NULL;
-#ifdef HAVE_PAM
    e_config->desklock_auth_method = 0;
-#endif
    e_config->desklock_login_box_zone = -1;
    e_config->desklock_autolock = 0;
    e_config->desklock_use_timeout = 0;

diff --git a/src/bin/e_config.h b/src/bin/e_config.h
index 9dc63c0..8e3b57d 100644 (file)
--- a/src/bin/e_config.h
+++ b/src/bin/e_config.h
@@ -217,9 +217,7 @@ struct _E_Config
 
    char              *desklock_personal_passwd; // GUI
    char              *desklock_background; // GUI
-#ifdef HAVE_PAM
    int       desklock_auth_method; // GUI
-#endif
    int       desklock_login_box_zone; // GUI
    int        desklock_autolock; // GUI
    int        desklock_use_timeout; // GUI