From b357283fed86d6439017d62e5147d35796e2f54a Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Tue, 23 Oct 2007 04:49:41 +0000 Subject: Rework the dialog design a bit. 2007-10-23 William Jon McCann * common/gdm-common.c: (gdm_signal_pid): * common/gdm-common.h: * daemon/Makefile.am: * daemon/gdm-greeter-session.c: (spawn_child_setup), (stop_dbus_daemon), (gdm_greeter_session_stop): * daemon/gdm-server.c: (gdm_server_stop): * daemon/gdm-session-worker-job.c: (gdm_session_worker_job_stop): * daemon/gdm-slave-proxy.c: (kill_slave): * gui/simple-greeter/gdm-simple-greeter.c: (set_sensitive), (set_focus), (reset_dialog), (gdm_simple_greeter_info_query), (gdm_simple_greeter_secret_info_query), (log_in_button_clicked), (create_greeter), (gdm_simple_greeter_init): * gui/simple-greeter/gdm-simple-greeter.glade: Rework the dialog design a bit. svn path=/trunk/; revision=5390 --- daemon/gdm-session-worker-job.c | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) (limited to 'daemon/gdm-session-worker-job.c') diff --git a/daemon/gdm-session-worker-job.c b/daemon/gdm-session-worker-job.c index 84b8b210..9e54bcac 100644 --- a/daemon/gdm-session-worker-job.c +++ b/daemon/gdm-session-worker-job.c @@ -221,32 +221,6 @@ gdm_session_worker_job_start (GdmSessionWorkerJob *session_worker_job) return res; } -static int -signal_pid (int pid, - int signal) -{ - int status = -1; - - /* perhaps block sigchld */ - - status = kill (pid, signal); - - if (status < 0) { - if (errno == ESRCH) { - g_warning ("Child process %lu was already dead.", - (unsigned long) pid); - } else { - g_warning ("Couldn't kill child process %lu: %s", - (unsigned long) pid, - g_strerror (errno)); - } - } - - /* perhaps unblock sigchld */ - - return status; -} - static int wait_on_child (int pid) { @@ -302,7 +276,7 @@ gdm_session_worker_job_stop (GdmSessionWorkerJob *session_worker_job) g_debug ("Stopping session_worker_job pid:%d", session_worker_job->priv->pid); - signal_pid (session_worker_job->priv->pid, SIGTERM); + gdm_signal_pid (session_worker_job->priv->pid, SIGTERM); session_worker_job_died (session_worker_job); return TRUE; -- cgit v1.2.1