[rygel] core: Port signal handling to GLib 2.30 API
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rygel] core: Port signal handling to GLib 2.30 API
- Date: Mon, 26 Mar 2012 16:01:14 +0000 (UTC)
commit 71ac93b681d9132ed827b5fd1376371f8f177e95
Author: Jens Georg <mail jensge org>
Date: Thu Sep 29 07:34:28 2011 +0200
core: Port signal handling to GLib 2.30 API
src/rygel/Makefile.am | 1 -
src/rygel/rygel-main.vala | 7 ++-
src/rygel/rygel-misc.vapi | 1 +
src/rygel/rygel-signal-handler.vala | 74 -----------------------------------
4 files changed, 5 insertions(+), 78 deletions(-)
---
diff --git a/src/rygel/Makefile.am b/src/rygel/Makefile.am
index def47d2..ee71486 100644
--- a/src/rygel/Makefile.am
+++ b/src/rygel/Makefile.am
@@ -26,7 +26,6 @@ rygel_SOURCES = \
rygel-root-device.vala \
rygel-root-device-factory.vala \
rygel-xml-utils.vala \
- rygel-signal-handler.vala \
rygel-main.vala
VAPI_SOURCE_FILES = \
diff --git a/src/rygel/rygel-main.vala b/src/rygel/rygel-main.vala
index 453529d..6217f19 100644
--- a/src/rygel/rygel-main.vala
+++ b/src/rygel/rygel-main.vala
@@ -23,6 +23,7 @@
using Gee;
using GUPnP;
+using Posix;
public class Rygel.Main : Object {
private static int PLUGIN_TIMEOUT = 5;
@@ -55,7 +56,9 @@ public class Rygel.Main : Object {
this.plugin_loader.plugin_available.connect (this.on_plugin_loaded);
- SignalHandler.setup (this);
+ Unix.signal_add (SIGHUP, () => { this.restart (); return true; });
+ Unix.signal_add (SIGINT, () => { this.exit (0); return false; });
+ Unix.signal_add (SIGTERM, () => { this.exit (0); return false; });
}
public void exit (int exit_code) {
@@ -63,8 +66,6 @@ public class Rygel.Main : Object {
this.root_devices = null;
this.main_loop.quit ();
-
- SignalHandler.cleanup ();
}
public void restart () {
diff --git a/src/rygel/rygel-misc.vapi b/src/rygel/rygel-misc.vapi
index 487bae0..3fb4659 100644
--- a/src/rygel/rygel-misc.vapi
+++ b/src/rygel/rygel-misc.vapi
@@ -28,4 +28,5 @@ namespace Rygel.Misc {
array_null_terminated = true)]
string[] argv);
}
+
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]