Merge branch 'feature/upstream' into develop

1 files changed, 25 insertions, 14 deletions

diff --git a/src/daemon.vala b/src/daemon.vala
index 32f7e11..ba3ae91 100644
--- a/src/daemon.vala
+++ b/src/daemon.vala
@@ -1,18 +1,24 @@
 /////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2011-2017 by Simon Schneegans
+// Copyright 2011-2018 Simon Schneegans
 //
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or (at
-// your option) any later version.
-//
-// This program is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 /////////////////////////////////////////////////////////////////////////
 
 namespace GnomePie {
@@ -49,7 +55,7 @@ public class Daemon : GLib.Application {
     /////////////////////////////////////////////////////////////////////
 
     public static int main(string[] args) {
-        version = "0.7.1";
+        version = "0.7.2";
 
         // disable overlay scrollbar --- hacky workaround for black /
         // transparent background
@@ -121,8 +127,13 @@ public class Daemon : GLib.Application {
         Intl.textdomain("gnomepie");
 
         // connect SigHandlers
+#if VALA_0_40
+        Posix.signal(Posix.Signal.INT, sig_handler);
+        Posix.signal(Posix.Signal.TERM, sig_handler);
+#else
         Posix.signal(Posix.SIGINT, sig_handler);
         Posix.signal(Posix.SIGTERM, sig_handler);
+#endif
 
         this.startup.connect(()=>{