fix: add missing property to configuration object
This commit is contained in:
parent
b4a4e734d8
commit
9cd4da9d74
@ -14,6 +14,7 @@ enum
|
|||||||
DAEMON_LOGIN_SESSION_COMMAND,
|
DAEMON_LOGIN_SESSION_COMMAND,
|
||||||
DAEMON_LOGIN_SESSION_USER,
|
DAEMON_LOGIN_SESSION_USER,
|
||||||
DAEMON_SESSION_COMMAND,
|
DAEMON_SESSION_COMMAND,
|
||||||
|
DAEMON_SESSION_PAM_SERVICE,
|
||||||
N_PROPERTIES
|
N_PROPERTIES
|
||||||
};
|
};
|
||||||
static GParamSpec *conf_properties[N_PROPERTIES] = {0};
|
static GParamSpec *conf_properties[N_PROPERTIES] = {0};
|
||||||
@ -104,6 +105,9 @@ static void daemon_configuration_get_property(GObject *object, guint property_id
|
|||||||
case DAEMON_SESSION_COMMAND:
|
case DAEMON_SESSION_COMMAND:
|
||||||
g_value_set_string(value, self->session_command);
|
g_value_set_string(value, self->session_command);
|
||||||
break;
|
break;
|
||||||
|
case DAEMON_SESSION_PAM_SERVICE:
|
||||||
|
g_value_set_string(value, self->pam_service);
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
|
||||||
break;
|
break;
|
||||||
@ -138,6 +142,7 @@ static void daemon_configuration_class_init(DaemonConfigurationClass *class)
|
|||||||
conf_properties[DAEMON_LOGIN_SESSION_COMMAND] = g_param_spec_string("login-session-command", NULL, "Login session command", NULL, G_PARAM_READABLE);
|
conf_properties[DAEMON_LOGIN_SESSION_COMMAND] = g_param_spec_string("login-session-command", NULL, "Login session command", NULL, G_PARAM_READABLE);
|
||||||
conf_properties[DAEMON_LOGIN_SESSION_USER] = g_param_spec_string("login-session-user", NULL, "Login session user", NULL, G_PARAM_READABLE);
|
conf_properties[DAEMON_LOGIN_SESSION_USER] = g_param_spec_string("login-session-user", NULL, "Login session user", NULL, G_PARAM_READABLE);
|
||||||
conf_properties[DAEMON_SESSION_COMMAND] = g_param_spec_string("session-command", NULL, "Session command", NULL, G_PARAM_READABLE);
|
conf_properties[DAEMON_SESSION_COMMAND] = g_param_spec_string("session-command", NULL, "Session command", NULL, G_PARAM_READABLE);
|
||||||
|
conf_properties[DAEMON_SESSION_PAM_SERVICE] = g_param_spec_string("pam-service", NULL, "PAM service name", NULL, G_PARAM_READABLE);
|
||||||
g_object_class_install_properties (gobject_class, N_PROPERTIES, conf_properties);
|
g_object_class_install_properties (gobject_class, N_PROPERTIES, conf_properties);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -423,7 +423,7 @@ SessionManager *session_manager_new(const gchar *config_file)
|
|||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
gchar *pam_service = NULL;
|
gchar *pam_service = NULL;
|
||||||
g_object_get(manager->configuration, "pam_service", &pam_service, NULL);
|
g_object_get(manager->configuration, "pam-service", &pam_service, NULL);
|
||||||
if (pam_service == NULL)
|
if (pam_service == NULL)
|
||||||
{
|
{
|
||||||
pam_service = g_strdup(DEFAULT_PAM_SERVICE);
|
pam_service = g_strdup(DEFAULT_PAM_SERVICE);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user