diff options
author | Robert Ancell <robert.ancell@canonical.com> | 2011-07-19 09:11:03 +1000 |
---|---|---|
committer | Robert Ancell <robert.ancell@canonical.com> | 2011-07-19 09:11:03 +1000 |
commit | f5913d33132c953c37a04f478b193c940f115e67 (patch) | |
tree | 3791eaa832b7199809b76d5f941c6add7ae54051 /src/session.c | |
parent | 937926f12f728235d5de3dd1d245be0c9165f47c (diff) | |
download | lightdm-f5913d33132c953c37a04f478b193c940f115e67.tar.gz |
Rename ChildProcess to Process
Diffstat (limited to 'src/session.c')
-rw-r--r-- | src/session.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/session.c b/src/session.c index 0e4ab2c8..43897347 100644 --- a/src/session.c +++ b/src/session.c @@ -36,7 +36,7 @@ struct SessionPrivate gboolean is_greeter; }; -G_DEFINE_TYPE (Session, session, CHILD_PROCESS_TYPE); +G_DEFINE_TYPE (Session, session, PROCESS_TYPE); void session_set_user (Session *session, User *user) @@ -47,11 +47,11 @@ session_set_user (Session *session, User *user) g_object_unref (session->priv->user); session->priv->user = g_object_ref (user); - child_process_set_env (CHILD_PROCESS (session), "PATH", "/usr/local/bin:/usr/bin:/bin"); - child_process_set_env (CHILD_PROCESS (session), "USER", user_get_name (user)); - child_process_set_env (CHILD_PROCESS (session), "USERNAME", user_get_name (user)); // FIXME: Is this required? - child_process_set_env (CHILD_PROCESS (session), "HOME", user_get_home_directory (user)); - child_process_set_env (CHILD_PROCESS (session), "SHELL", user_get_shell (user)); + process_set_env (PROCESS (session), "PATH", "/usr/local/bin:/usr/bin:/bin"); + process_set_env (PROCESS (session), "USER", user_get_name (user)); + process_set_env (PROCESS (session), "USERNAME", user_get_name (user)); // FIXME: Is this required? + process_set_env (PROCESS (session), "HOME", user_get_home_directory (user)); + process_set_env (PROCESS (session), "SHELL", user_get_shell (user)); } User * @@ -150,13 +150,13 @@ session_real_start (Session *session) g_debug ("Launching session"); if (session->priv->cookie) - child_process_set_env (CHILD_PROCESS (session), "XDG_SESSION_COOKIE", session->priv->cookie); + process_set_env (PROCESS (session), "XDG_SESSION_COOKIE", session->priv->cookie); - result = child_process_start (CHILD_PROCESS (session), - session->priv->user, - user_get_home_directory (session->priv->user), - absolute_command, - &error); + result = process_start (PROCESS (session), + session->priv->user, + user_get_home_directory (session->priv->user), + absolute_command, + &error); g_free (absolute_command); if (!result) @@ -176,7 +176,7 @@ session_start (Session *session) static void session_real_stop (Session *session) { - child_process_signal (CHILD_PROCESS (session), SIGTERM); + process_signal (PROCESS (session), SIGTERM); } void |