Skip to content

Make location of .xession-errors depend on user configuration #335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
madpilot78 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Make location of .xession-errors depend on user configuration #335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions common/configuration.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,7 @@ config_init (Configuration *config)
g_hash_table_insert (config->priv->lightdm_keys, "greeters-directory", GINT_TO_POINTER (KEY_SUPPORTED));
g_hash_table_insert (config->priv->lightdm_keys, "backup-logs", GINT_TO_POINTER (KEY_SUPPORTED));
g_hash_table_insert (config->priv->lightdm_keys, "dbus-service", GINT_TO_POINTER (KEY_SUPPORTED));
g_hash_table_insert (config->priv->lightdm_keys, "smart-xsession-errors", GINT_TO_POINTER (KEY_SUPPORTED));
g_hash_table_insert (config->priv->lightdm_keys, "logind-load-seats", GINT_TO_POINTER (KEY_DEPRECATED));

g_hash_table_insert (config->priv->seat_keys, "type", GINT_TO_POINTER (KEY_SUPPORTED));
Expand Down
3 changes: 3 additions & 0 deletions data/lightdm.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
# greeters-directory = Directory to find greeters
# backup-logs = True to move add a .old suffix to old log files when opening new ones
# dbus-service = True if LightDM provides a D-Bus service to control it
# smart-xsession-errors = True to force .xsesion.errors file to be positioned according to XDG standards
# Default False, put it in ~/.xsession-errors
#
[LightDM]
#start-default-seat=true
Expand All @@ -35,6 +37,7 @@
#greeters-directory=$XDG_DATA_DIRS/lightdm/greeters:$XDG_DATA_DIRS/xgreeters
#backup-logs=true
#dbus-service=true
#smart-xsession-errors=false

#
# Seat configuration
Expand Down
2 changes: 2 additions & 0 deletions src/lightdm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -771,6 +771,8 @@ main (int argc, char **argv)
config_set_boolean (config_get_instance (), "LightDM", "backup-logs", TRUE);
if (!config_has_key (config_get_instance (), "LightDM", "dbus-service"))
config_set_boolean (config_get_instance (), "LightDM", "dbus-service", TRUE);
if (!config_has_key (config_get_instance (), "LightDM", "smart-xsession-errors"))
config_set_boolean (config_get_instance (), "LightDM", "smart-xsession-errors", FALSE);
if (!config_has_key (config_get_instance (), "Seat:*", "type"))
config_set_string (config_get_instance (), "Seat:*", "type", "local");
if (!config_has_key (config_get_instance (), "Seat:*", "pam-service"))
Expand Down
12 changes: 11 additions & 1 deletion src/session.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -981,7 +981,17 @@ session_init (Session *session)
{
SessionPrivate *priv = session_get_instance_private (session);

priv->log_filename = g_strdup (".xsession-errors");
if(config_get_boolean (config_get_instance (), "LightDM", "smart-xsession-errors")) {
if (g_getenv ("XDG_STATE_HOME")) {
priv->log_filename = g_build_filename (g_getenv ("XDG_STATE_HOME"), ".xsession-errors", NULL);
} else if (g_getenv ("XDG_CACHE_HOME")) {
priv->log_filename = g_build_filename (g_getenv ("XDG_CACHE_HOME"), ".xsession-errors", NULL);
} else {
priv->log_filename = g_build_filename (".cache", ".xsession-errors", NULL);
}
} else {
priv->log_filename = g_strdup (".xsession-errors");
}
priv->log_mode = LOG_MODE_BACKUP_AND_TRUNCATE;
priv->to_child_input = -1;
priv->from_child_output = -1;
Expand Down