aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-06-21 13:34:50 +0000
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-06-21 13:34:50 +0000
commitb64aabd538656abff8a090477a2225c37fbd9976 (patch)
treed21168b36ad5a7db20681a7f03dba2ff6509e218
parentb12c6d9683451f8b40bfe4d03a14c6aef96fa4b1 (diff)
downloadarctica-greeter-b64aabd538656abff8a090477a2225c37fbd9976.tar.gz
arctica-greeter-b64aabd538656abff8a090477a2225c37fbd9976.tar.bz2
arctica-greeter-b64aabd538656abff8a090477a2225c37fbd9976.zip
Posix.Signal.<SIG>: Provide old-style Posix.SIG<SIG> API calls if built with Vala API version << 0.40. (Fixes FTBFS on Debian 9).
-rw-r--r--src/arctica-greeter.vala12
-rw-r--r--src/menubar.vala4
-rw-r--r--src/settings-daemon.vala4
3 files changed, 20 insertions, 0 deletions
diff --git a/src/arctica-greeter.vala b/src/arctica-greeter.vala
index 8e499b9..bf5750a 100644
--- a/src/arctica-greeter.vala
+++ b/src/arctica-greeter.vala
@@ -954,7 +954,11 @@ public class ArcticaGreeter
if (nmapplet_pid != 0)
{
+#if VALA_0_40
Posix.kill (nmapplet_pid, Posix.Signal.TERM);
+#else
+ Posix.kill (nmapplet_pid, Posix.SIGTERM);
+#endif
int status;
Posix.waitpid (nmapplet_pid, out status, 0);
if (Process.if_exited (status))
@@ -966,7 +970,11 @@ public class ArcticaGreeter
if (atspi_pid != 0)
{
+#if VALA_0_40
Posix.kill (atspi_pid, Posix.Signal.KILL);
+#else
+ Posix.kill (atspi_pid, Posix.SIGKILL);
+#endif
int status;
Posix.waitpid (atspi_pid, out status, 0);
if (Process.if_exited (status))
@@ -978,7 +986,11 @@ public class ArcticaGreeter
if (marco_pid != 0)
{
+#if VALA_0_40
Posix.kill (marco_pid, Posix.Signal.TERM);
+#else
+ Posix.kill (marco_pid, Posix.SIGTERM);
+#endif
int status;
Posix.waitpid (marco_pid, out status, 0);
if (Process.if_exited (status))
diff --git a/src/menubar.vala b/src/menubar.vala
index 1556aef..e5c47c9 100644
--- a/src/menubar.vala
+++ b/src/menubar.vala
@@ -162,7 +162,11 @@ public class MenuBar : Gtk.MenuBar
{
if (pid > 0)
{
+#if VALA_0_40
Posix.kill (pid, Posix.Signal.TERM);
+#else
+ Posix.kill (pid, Posix.SIGTERM);
+#endif
int status;
Posix.waitpid (pid, out status, 0);
pid = 0;
diff --git a/src/settings-daemon.vala b/src/settings-daemon.vala
index 59d1dd2..4a7b75f 100644
--- a/src/settings-daemon.vala
+++ b/src/settings-daemon.vala
@@ -182,7 +182,11 @@ public class SettingsDaemon : Object
{
if (sd_pid != 0)
{
+#if VALA_0_40
Posix.kill (sd_pid, Posix.Signal.KILL);
+#else
+ Posix.kill (sd_pid, Posix.SIGKILL);
+#endif
int status;
Posix.waitpid (sd_pid, out status, 0);
if (Process.if_exited (status))