return g_hash_table_lookup (seat->priv->properties, name);
}
+gchar **
+seat_get_string_list_property (Seat *seat, const gchar *name)
+{
+ g_return_val_if_fail (seat != NULL, NULL);
+ return g_strsplit (g_hash_table_lookup (seat->priv->properties, name), ";", 0);
+}
+
gboolean
seat_get_boolean_property (Seat *seat, const gchar *name)
{
return value ? atoi (value) : 0;
}
+const gchar *
+seat_get_name (Seat *seat)
+{
+ const gchar *name;
+
+ name = seat_get_string_property (seat, "xdg-seat");
+ if (name)
+ return name;
+
+ return "seat0";
+}
+
void
seat_set_can_switch (Seat *seat, gboolean can_switch)
{
static void
display_server_stopped_cb (DisplayServer *display_server, Seat *seat)
{
+ const gchar *script;
GList *list, *link;
Session *active_session;
l_debug (seat, "Display server stopped");
/* Run a script right after stopping the display server */
- const gchar *script;
script = seat_get_string_property (seat, "display-stopped-script");
if (script)
run_script (seat, NULL, script, NULL);
if (!active_session || session_get_display_server (active_session) == display_server)
{
l_debug (seat, "Active display server stopped, starting greeter");
- seat_switch_to_greeter (seat);
+ if (!seat_switch_to_greeter (seat))
+ {
+ l_debug (seat, "Stopping; failed to start a greeter");
+ seat_stop (seat);
+ }
}
}
DisplayServer *display_server;
display_server = create_display_server (seat, session_get_session_type (session));
+ session_set_display_server (session, display_server);
if (!display_server_start (display_server))
{
l_debug (seat, "Failed to start display server for greeter");
seat_stop (seat);
}
-
- session_set_display_server (session, display_server);
}
start_session (seat, SESSION (greeter_session));
script = seat_get_string_property (seat, "greeter-setup-script");
else
script = seat_get_string_property (seat, "session-setup-script");
- if (script && !run_script (seat, session_get_display_server (session), script, NULL))
+ if (script && !run_script (seat, session_get_display_server (session), script, session_get_user (session)))
{
l_debug (seat, "Switching to greeter due to failed setup script");
switch_to_greeter_from_failed_session (seat, session);
else if (!IS_GREETER (session) && session == seat_get_active_session (seat))
{
l_debug (seat, "Active session stopped, starting greeter");
- seat_switch_to_greeter (seat);
+ if (!seat_switch_to_greeter (seat))
+ {
+ l_debug (seat, "Stopping; failed to start a greeter");
+ seat_stop (seat);
+ }
}
/* Stop the display server if no-longer required */
return session;
}
+static void
+prepend_argv (gchar ***argv, const gchar *value)
+{
+ gchar **old_argv, **new_argv;
+ gint i;
+
+ old_argv = *argv;
+ new_argv = g_malloc (sizeof (gchar *) * (g_strv_length (*argv) + 2));
+ new_argv[0] = g_strdup (value);
+ for (i = 0; old_argv[i]; i++)
+ new_argv[i + 1] = old_argv[i];
+ new_argv[i + 1] = NULL;
+
+ g_free (*argv);
+ *argv = new_argv;
+}
+
static Session *
create_guest_session (Seat *seat)
{
- const gchar *session_name;
+ const gchar *session_name, *guest_wrapper;
gchar *sessions_dir, **argv;
SessionConfig *session_config;
Session *session;
session_set_do_authenticate (session, TRUE);
session_set_is_guest (session, TRUE);
argv = get_session_argv (seat, session_config, seat_get_string_property (seat, "session-wrapper"));
+ guest_wrapper = seat_get_string_property (seat, "guest-wrapper");
+ if (guest_wrapper)
+ {
+ gchar *path;
+ path = g_find_program_in_path (guest_wrapper);
+ prepend_argv (&argv, path ? path : guest_wrapper);
+ g_free (path);
+ }
+
session_set_argv (session, argv);
g_strfreev (argv);
g_object_unref (session_config);
return g_object_ref (session);
}
-static void
-prepend_argv (gchar ***argv, const gchar *value)
-{
- gchar **old_argv, **new_argv;
- gint i;
-
- old_argv = *argv;
- new_argv = g_malloc (sizeof (gchar *) * (g_strv_length (*argv) + 2));
- new_argv[0] = g_strdup (value);
- for (i = 0; old_argv[i]; i++)
- new_argv[i + 1] = old_argv[i];
- new_argv[i + 1] = NULL;
-
- g_free (*argv);
- *argv = new_argv;
-}
-
static gboolean
greeter_start_session_cb (Greeter *greeter, SessionType type, const gchar *session_name, Seat *seat)
{
Session *session, *existing_session;
- const gchar *username, *language = NULL;
- SessionConfig *session_config;
- User *user;
- gchar *sessions_dir = NULL;
- gchar **argv;
+ const gchar *username;
DisplayServer *display_server;
/* Get the session to use */
session_set_pam_service (session, AUTOLOGIN_SERVICE);
}
else
+ {
+ const gchar *language = NULL;
+ SessionConfig *session_config;
+ User *user;
+ gchar *sessions_dir = NULL;
+ gchar **argv;
+
session = greeter_get_authentication_session (greeter);
+
+ /* Get session command to run */
+ switch (type)
+ {
+ case SESSION_TYPE_LOCAL:
+ sessions_dir = config_get_string (config_get_instance (), "LightDM", "sessions-directory");
+ break;
+ case SESSION_TYPE_REMOTE:
+ sessions_dir = config_get_string (config_get_instance (), "LightDM", "remote-sessions-directory");
+ break;
+ }
+
+ /* Load user preferences */
+ user = session_get_user (session);
+ if (user)
+ {
+ if (!session_name)
+ session_name = user_get_xsession (user);
+ language = user_get_language (user);
+ }
+
+ if (!session_name)
+ session_name = seat_get_string_property (seat, "user-session");
+ if (user)
+ user_set_xsession (session_get_user (session), session_name);
+
+ session_config = find_session_config (seat, sessions_dir, session_name);
+ g_free (sessions_dir);
+ if (!session_config)
+ {
+ l_debug (seat, "Can't find session '%s'", seat_get_string_property (seat, "user-session"));
+ return FALSE;
+ }
+
+ configure_session (session, session_config, session_name, language);
+ argv = get_session_argv (seat, session_config, seat_get_string_property (seat, "session-wrapper"));
+ session_set_argv (session, argv);
+ g_strfreev (argv);
+ g_object_unref (session_config);
+ }
/* Switch to this session when it is ready */
if (seat->priv->session_to_activate)
return TRUE;
}
- /* Get session command to run */
- switch (type)
- {
- case SESSION_TYPE_LOCAL:
- sessions_dir = config_get_string (config_get_instance (), "LightDM", "sessions-directory");
- break;
- case SESSION_TYPE_REMOTE:
- sessions_dir = config_get_string (config_get_instance (), "LightDM", "remote-sessions-directory");
- break;
- }
-
- /* Load user preferences */
- user = session_get_user (session);
- if (user)
- {
- if (!session_name)
- session_name = user_get_xsession (user);
- language = user_get_language (user);
- }
-
- if (!session_name)
- session_name = seat_get_string_property (seat, "user-session");
- if (user)
- user_set_xsession (session_get_user (session), session_name);
-
- session_config = find_session_config (seat, sessions_dir, session_name);
- g_free (sessions_dir);
- if (!session_config)
- {
- l_debug (seat, "Can't find session '%s'", seat_get_string_property (seat, "user-session"));
- return FALSE;
- }
-
- configure_session (session, session_config, session_name, language);
- argv = get_session_argv (seat, session_config, seat_get_string_property (seat, "session-wrapper"));
- session_set_argv (session, argv);
- g_strfreev (argv);
- g_object_unref (session_config);
-
/* If can re-use the display server, stop the greeter first */
display_server = session_get_display_server (SESSION (greeter));
if (can_share_display_server (seat, display_server) &&
}
greeter_session = create_greeter_session (seat);
+ if (!greeter_session)
+ return FALSE;
+
if (seat->priv->session_to_activate)
g_object_unref (seat->priv->session_to_activate);
seat->priv->session_to_activate = g_object_ref (greeter_session);
return FALSE;
display_server = create_display_server (seat, session_get_session_type (session));
- if (!display_server_start (display_server))
- return FALSE;
if (seat->priv->session_to_activate)
g_object_unref (seat->priv->session_to_activate);
session_set_pam_service (session, AUTOLOGIN_SERVICE);
session_set_display_server (session, display_server);
- return TRUE;
+ return display_server_start (display_server);
}
gboolean
return FALSE;
display_server = create_display_server (seat, session_get_session_type (SESSION (greeter_session)));
- if (!display_server_start (display_server))
- return FALSE;
if (seat->priv->session_to_activate)
g_object_unref (seat->priv->session_to_activate);
greeter_set_hint (greeter_session, "select-user", username);
session_set_display_server (SESSION (greeter_session), display_server);
- return TRUE;
+ return display_server_start (display_server);
}
void
projects / sojka / lightdm.git / blobdiff