rygel: Drop misc.vapi

execvp is part of posix.vapi since 0.16.1

diff --git a/configure.ac b/configure.ac
index ef540f1..e4effb5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -29,7 +29,7 @@ LT_INIT([dlopen disable-static])
 
 dnl Required versions of library packages
 GLIB_REQUIRED=2.31.13
-VALA_REQUIRED=0.15.2
+VALA_REQUIRED=0.16.1
 VALADOC_REQUIRED=0.2
 GSSDP_REQUIRED=0.11.0
 GUPNP_REQUIRED=0.17.1

diff --git a/src/rygel/Makefile.am b/src/rygel/Makefile.am
index 438a388..2f2a953 100644 (file)
--- a/src/rygel/Makefile.am
+++ b/src/rygel/Makefile.am
@@ -18,7 +18,6 @@ rygel_SOURCES = \
 
 rygel_VALAFLAGS = \
        --pkg posix \
-       --pkg rygel-misc \
        --pkg gstreamer-0.10 \
        $(RYGEL_COMMON_VALAFLAGS)
 
@@ -35,7 +34,6 @@ MAINTAINERCLEANFILES += $(BUILT_SOURCES)
 
 EXTRA_DIST = \
        rygel-build-config.vapi \
-       rygel-misc.vapi \
        $(VAPI_FILES) \
        $(DEPS_FILES) \
        $(BUILT_SOURCES)

diff --git a/src/rygel/rygel-main.vala b/src/rygel/rygel-main.vala
index cedee0e..7445199 100644 (file)
--- a/src/rygel/rygel-main.vala
+++ b/src/rygel/rygel-main.vala
@@ -274,7 +274,7 @@ internal class Rygel.Main : Object {
         }
 
         if (main.need_restart) {
-            Misc.Posix.execvp (original_args[0], original_args);
+            Posix.execvp (original_args[0], original_args);
         }
 
         return exit_code;

diff --git a/src/rygel/rygel-misc.vapi b/src/rygel/rygel-misc.vapi
deleted file mode 100644 (file)
index 3fb4659..0000000
--- a/src/rygel/rygel-misc.vapi
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2010 Nokia Corporation.
- *
- * Author: Zeeshan Ali (Khattak) <zeeshanak@gnome.org>
- *
- * This file is part of Rygel.
- *
- * Rygel is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * Rygel 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 Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-namespace Rygel.Misc {
-    namespace Posix {
-        [CCode (cname = "execvp", cheader_filename = "unistd.h")]
-        public int execvp (string file,
-                           [CCode (array_length = false,
-                                   array_null_terminated = true)]
-                           string[] argv);
-    }
-
-}