diff options
| author | William Jon McCann <jmccann@redhat.com> | 2008-08-15 17:13:36 +0000 |
|---|---|---|
| committer | William Jon McCann <mccann@src.gnome.org> | 2008-08-15 17:13:36 +0000 |
| commit | f5d6584fa8d60ab78ec2307ab7a8787fb6895a91 (patch) | |
| tree | 2dfcff0a8bd05eaf6072e2eecec02fba9cf6f1e1 /daemon/session-worker-main.c | |
| parent | 146a464aa0208523e174e65dcbfaa362375bc921 (diff) | |
| download | gdm-f5d6584fa8d60ab78ec2307ab7a8787fb6895a91.tar.gz | |
Use a callback for the fatal handler instead of supplying the main_loop.
2008-08-15 William Jon McCann <jmccann@redhat.com>
* common/gdm-signal-handler.c (signal_io_watch),
(gdm_signal_handler_set_fatal_func):
* common/gdm-signal-handler.h:
* daemon/factory-slave-main.c (main):
* daemon/gdm-session-direct.c (stop_worker):
* daemon/gdm-session-worker-job.c (session_worker_job_child_watch):
* daemon/main.c (main):
* daemon/product-slave-main.c (main):
* daemon/session-worker-main.c (main):
* daemon/simple-slave-main.c (main):
* daemon/xdmcp-chooser-slave-main.c (main):
Use a callback for the fatal handler instead of supplying
the main_loop.
svn path=/trunk/; revision=6382
Diffstat (limited to 'daemon/session-worker-main.c')
| -rw-r--r-- | daemon/session-worker-main.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/daemon/session-worker-main.c b/daemon/session-worker-main.c index 68669d57..6709cbeb 100644 --- a/daemon/session-worker-main.c +++ b/daemon/session-worker-main.c @@ -166,7 +166,9 @@ main (int argc, main_loop = g_main_loop_new (NULL, FALSE); signal_handler = gdm_signal_handler_new (); - gdm_signal_handler_set_main_loop (signal_handler, main_loop); + gdm_signal_handler_set_fatal_func (signal_handler, + (GDestroyNotify)g_main_loop_quit, + main_loop); gdm_signal_handler_add (signal_handler, SIGTERM, signal_cb, NULL); gdm_signal_handler_add (signal_handler, SIGINT, signal_cb, NULL); gdm_signal_handler_add (signal_handler, SIGILL, signal_cb, NULL); |