From 6fc3545a87da33a79087c15758dd0652771201dc Mon Sep 17 00:00:00 2001 From: Mark Ryan Date: Tue, 13 Nov 2012 19:08:18 +0100 Subject: [PATCH] Updated GUPnP to version 0.19.1 (24bd15c) --- INSTALL | 9 +- Makefile.am | 4 +- Makefile.in | 49 ++- NEWS | 29 ++ aclocal.m4 | 11 +- build-aux/config.sub | 11 +- build-aux/depcomp | 124 +++--- build-aux/ltmain.sh | 4 +- config.h.in | 5 + configure | 453 +++++++++++++++------- configure.ac | 13 +- doc/Makefile.in | 27 +- doc/html/GUPnPContext.html | 71 ++-- doc/html/GUPnPContextManager.html | 34 +- doc/html/GUPnPControlPoint.html | 38 +- doc/html/GUPnPDevice.html | 2 +- doc/html/GUPnPDeviceInfo.html | 122 +++--- doc/html/GUPnPDeviceProxy.html | 2 +- doc/html/GUPnPResourceFactory.html | 28 +- doc/html/GUPnPRootDevice.html | 30 +- doc/html/GUPnPService.html | 128 +++--- doc/html/GUPnPServiceInfo.html | 62 +-- doc/html/GUPnPServiceProxy.html | 290 +++++++------- doc/html/GUPnPXMLDoc.html | 10 +- doc/html/annotation-glossary.html | 13 +- doc/html/client-tutorial.html | 10 +- doc/html/gupnp-Error-codes.html | 24 +- doc/html/gupnp-binding-tool.html | 6 +- doc/html/gupnp-gupnp-service-introspection.html | 78 ++-- doc/html/index.html | 4 +- doc/html/index.sgml | 3 +- doc/html/ix01.html | 2 +- doc/html/server-tutorial.html | 23 +- examples/Makefile.in | 27 +- gupnp-1.0-uninstalled.pc.in | 3 +- gupnp-1.0.pc.in | 3 +- libgupnp/Makefile.am | 3 +- libgupnp/Makefile.in | 48 ++- libgupnp/gupnp-context-manager.c | 14 + libgupnp/gupnp-context-manager.h | 2 + libgupnp/gupnp-context.c | 7 +- libgupnp/gupnp-device-info.c | 28 +- libgupnp/gupnp-service-info.c | 27 +- libgupnp/gupnp-service-introspection.c | 5 +- libgupnp/gupnp-service-introspection.h | 4 +- libgupnp/gupnp-service-proxy.c | 4 +- libgupnp/gupnp-service.c | 8 +- libgupnp/gupnp-service.h | 1 + m4/vapigen.m4 | 41 ++ packaging/GUPnP.changes | 3 + packaging/GUPnP.spec | 4 +- tests/Makefile.in | 38 +- tests/gtest/Makefile.in | 27 +- tools/Makefile.in | 32 +- vala/GUPnP-1.0.metadata | 38 ++ vala/Makefile.am | 21 + vala/Makefile.in | 496 ++++++++++++++++++++++++ vala/gupnp-1.0-custom.vala | 68 ++++ vala/gupnp-1.0.deps | 3 + 59 files changed, 1891 insertions(+), 783 deletions(-) create mode 100644 m4/vapigen.m4 create mode 100644 vala/GUPnP-1.0.metadata create mode 100644 vala/Makefile.am create mode 100644 vala/Makefile.in create mode 100644 vala/gupnp-1.0-custom.vala create mode 100644 vala/gupnp-1.0.deps diff --git a/INSTALL b/INSTALL index 7d1c323..a1e89e1 100644 --- a/INSTALL +++ b/INSTALL @@ -1,8 +1,8 @@ Installation Instructions ************************* -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007, 2008, 2009 Free Software Foundation, Inc. +Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation, +Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright @@ -226,6 +226,11 @@ order to use an ANSI C compiler: and if that doesn't work, install pre-built binaries of GCC for HP-UX. + HP-UX `make' updates targets which have the same time stamps as +their prerequisites, which makes it generally unusable when shipped +generated files such as `configure' are involved. Use GNU `make' +instead. + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot parse its `' header file. The option `-nodtk' can be used as a workaround. If GNU CC is not installed, it is therefore recommended diff --git a/Makefile.am b/Makefile.am index e92161a..1185e35 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,13 +1,13 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} -SUBDIRS = libgupnp tools examples tests doc +SUBDIRS = libgupnp tools examples tests doc vala pkgconfig_DATA= gupnp-1.0.pc pkgconfigdir = $(libdir)/pkgconfig EXTRA_DIST = gupnp-1.0.pc.in gupnp-1.0-uninstalled.pc.in -DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc +DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection # Extra clean files so that maintainer-clean removes *everything* MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub configure depcomp install-sh ltmain.sh Makefile.in missing config.h.in diff --git a/Makefile.in b/Makefile.in index 5de66a5..e407fa3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -48,7 +65,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ @@ -72,6 +89,11 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -241,6 +263,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NETLINK = @USE_NETLINK@ +VAPIGEN = @VAPIGEN@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -299,11 +322,11 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} -SUBDIRS = libgupnp tools examples tests doc +SUBDIRS = libgupnp tools examples tests doc vala pkgconfig_DATA = gupnp-1.0.pc pkgconfigdir = $(libdir)/pkgconfig EXTRA_DIST = gupnp-1.0.pc.in gupnp-1.0-uninstalled.pc.in -DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc +DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection # Extra clean files so that maintainer-clean removes *everything* MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub configure depcomp install-sh ltmain.sh Makefile.in missing config.h.in @@ -375,8 +398,11 @@ distclean-libtool: -rm -f libtool config.lt install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) - test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -561,13 +587,10 @@ distdir: $(DISTFILES) done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -652,7 +675,7 @@ distcheck: dist *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod a+w $(distdir) + chmod -R a-w $(distdir); chmod u+w $(distdir) mkdir $(distdir)/_build mkdir $(distdir)/_inst chmod a-w $(distdir) diff --git a/NEWS b/NEWS index 9a77978..08a16f7 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,32 @@ +0.19.1 +====== +Changes since 0.19.0: +- Include m4 macro for finding vapigen. +- Run introspection with make distcheck. +- Lower G-I requirement again. +- Add gupnp_context_manager_get_port. +- Don't stop configure if vapigen can't be found. +- Drop some deprecated stuff from VAPI. + +All contributors to this release: + Jens Georg + +0.19.0 +====== + +Changes since 0.18.4: + +- Add an abstract base class for simple context managers. +- Clean-up pkg-config files to not leak libraries. +- Generate VAPI from GIR file. + +Dependency-related changes: + - Require gssdp >= 0.13.0 + +All contributors: + Jens Georg + Andreas Henriksson + 0.18.0 ====== diff --git a/aclocal.m4 b/aclocal.m4 index 259d88c..c5649ce 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.11.3 -*- Autoconf -*- +# generated automatically by aclocal 1.11.6 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, @@ -14,8 +14,8 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, -[m4_warning([this file was generated for autoconf 2.68. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, +[m4_warning([this file was generated for autoconf 2.69. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) @@ -198,7 +198,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.11' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.3], [], +m4_if([$1], [1.11.6], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -214,7 +214,7 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.3])dnl +[AM_AUTOMAKE_VERSION([1.11.6])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) @@ -1252,3 +1252,4 @@ m4_include([m4/ltoptions.m4]) m4_include([m4/ltsugar.m4]) m4_include([m4/ltversion.m4]) m4_include([m4/lt~obsolete.m4]) +m4_include([m4/vapigen.m4]) diff --git a/build-aux/config.sub b/build-aux/config.sub index c894da4..6205f84 100755 --- a/build-aux/config.sub +++ b/build-aux/config.sub @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, # 2011, 2012 Free Software Foundation, Inc. -timestamp='2012-02-10' +timestamp='2012-04-18' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -225,6 +225,12 @@ case $os in -isc*) basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -lynx*178) + os=-lynxos178 + ;; + -lynx*5) + os=-lynxos5 + ;; -lynx*) os=-lynxos ;; @@ -1537,6 +1543,9 @@ case $basic_machine in c4x-* | tic4x-*) os=-coff ;; + hexagon-*) + os=-elf + ;; tic54x-*) os=-coff ;; diff --git a/build-aux/depcomp b/build-aux/depcomp index bd0ac08..25a39e6 100755 --- a/build-aux/depcomp +++ b/build-aux/depcomp @@ -1,10 +1,10 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2011-12-04.11; # UTC +scriptversion=2012-03-27.16; # UTC # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010, -# 2011 Free Software Foundation, Inc. +# 2011, 2012 Free Software Foundation, Inc. # 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 @@ -28,7 +28,7 @@ scriptversion=2011-12-04.11; # UTC case $1 in '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + echo "$0: No command. Try '$0 --help' for more information." 1>&2 exit 1; ;; -h | --h*) @@ -40,8 +40,8 @@ as side-effects. Environment variables: depmode Dependency tracking mode. - source Source file read by `PROGRAMS ARGS'. - object Object file output by `PROGRAMS ARGS'. + source Source file read by 'PROGRAMS ARGS'. + object Object file output by 'PROGRAMS ARGS'. DEPDIR directory where to store dependencies. depfile Dependency file to output. tmpdepfile Temporary file to use when outputting dependencies. @@ -57,6 +57,12 @@ EOF ;; esac +# A tabulation character. +tab=' ' +# A newline character. +nl=' +' + if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 exit 1 @@ -102,6 +108,12 @@ if test "$depmode" = msvc7msys; then depmode=msvc7 fi +if test "$depmode" = xlc; then + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations. + gccflag=-qmakedep=gcc,-MF + depmode=gcc +fi + case "$depmode" in gcc3) ## gcc 3 implements dependency tracking that does exactly what @@ -156,15 +168,14 @@ gcc) ## The second -e expression handles DOS-style file names with drive letters. sed -e 's/^[^:]*: / /' \ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" -## This next piece of magic avoids the `deleted header file' problem. +## This next piece of magic avoids the "deleted header file" problem. ## The problem is that when a header file which appears in a .P file ## is deleted, the dependency causes make to die (because there is ## typically no way to rebuild the header). We avoid this by adding ## dummy dependencies for each header file. Too bad gcc doesn't do ## this for us directly. - tr ' ' ' -' < "$tmpdepfile" | -## Some versions of gcc put a space before the `:'. On the theory + tr ' ' "$nl" < "$tmpdepfile" | +## Some versions of gcc put a space before the ':'. On the theory ## that the space means something, we add a space to the output as ## well. hp depmode also adds that space, but also prefixes the VPATH ## to the object. Take care to not repeat it in the output. @@ -203,18 +214,15 @@ sgi) # clever and replace this with sed code, as IRIX sed won't handle # lines with more than a fixed number of characters (4096 in # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; - # the IRIX cc adds comments like `#:fec' to the end of the + # the IRIX cc adds comments like '#:fec' to the end of the # dependency line. - tr ' ' ' -' < "$tmpdepfile" \ + tr ' ' "$nl" < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr ' -' ' ' >> "$depfile" + tr "$nl" ' ' >> "$depfile" echo >> "$depfile" # The second pass generates a dummy entry for each header file. - tr ' ' ' -' < "$tmpdepfile" \ + tr ' ' "$nl" < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ >> "$depfile" else @@ -226,10 +234,17 @@ sgi) rm -f "$tmpdepfile" ;; +xlc) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + aix) # The C for AIX Compiler uses -M and outputs the dependencies # in a .u file. In older versions, this file always lives in the - # current directory. Also, the AIX compiler puts `$object:' at the + # current directory. Also, the AIX compiler puts '$object:' at the # start of each line; $object doesn't have directory information. # Version 6 uses the directory in both cases. dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` @@ -259,12 +274,11 @@ aix) test -f "$tmpdepfile" && break done if test -f "$tmpdepfile"; then - # Each line is of the form `foo.o: dependent.h'. + # Each line is of the form 'foo.o: dependent.h'. # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. + # '$object: dependent.h' and one to simply 'dependent.h:'. sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" else # The sourcefile does not contain any dependencies, so just # store a dummy comment line, to avoid errors with the Makefile @@ -275,23 +289,26 @@ aix) ;; icc) - # Intel's C compiler understands `-MD -MF file'. However on - # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c + # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'. + # However on + # $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c # ICC 7.0 will fill foo.d with something like # foo.o: sub/foo.c # foo.o: sub/foo.h - # which is wrong. We want: + # which is wrong. We want # sub/foo.o: sub/foo.c # sub/foo.o: sub/foo.h # sub/foo.c: # sub/foo.h: # ICC 7.1 will output # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using \ : + # and will wrap long lines using '\': # foo.o: sub/foo.c ... \ # sub/foo.h ... \ # ... - + # tcc 0.9.26 (FIXME still under development at the moment of writing) + # will emit a similar output, but also prepend the continuation lines + # with horizontal tabulation characters. "$@" -MD -MF "$tmpdepfile" stat=$? if test $stat -eq 0; then : @@ -300,15 +317,21 @@ icc) exit $stat fi rm -f "$depfile" - # Each line is of the form `foo.o: dependent.h', - # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. + # Each line is of the form 'foo.o: dependent.h', + # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'. # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" - # Some versions of the HPUX 10.20 sed can't process this invocation - # correctly. Breaking it into two sed invocations is a workaround. - sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | - sed -e 's/$/ :/' >> "$depfile" + # '$object: dependent.h' and one to simply 'dependent.h:'. + sed -e "s/^[ $tab][ $tab]*/ /" -e "s,^[^:]*:,$object :," \ + < "$tmpdepfile" > "$depfile" + sed ' + s/[ '"$tab"'][ '"$tab"']*/ /g + s/^ *// + s/ *\\*$// + s/^[^:]*: *// + /^$/d + /:$/d + s/$/ :/ + ' < "$tmpdepfile" >> "$depfile" rm -f "$tmpdepfile" ;; @@ -344,7 +367,7 @@ hp2) done if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" - # Add `dependent.h:' lines. + # Add 'dependent.h:' lines. sed -ne '2,${ s/^ *// s/ \\*$// @@ -359,9 +382,9 @@ hp2) tru64) # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. + # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in `foo.d' instead, so we check for that too. + # dependencies in 'foo.d' instead, so we check for that too. # Subdirectories are respected. dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` test "x$dir" = "x$object" && dir= @@ -407,8 +430,7 @@ tru64) done if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" + sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" else echo "#dummy" > "$depfile" fi @@ -443,11 +465,11 @@ msvc7) p }' | $cygpath_u | sort -u | sed -n ' s/ /\\ /g -s/\(.*\)/ \1 \\/p +s/\(.*\)/'"$tab"'\1 \\/p s/.\(.*\) \\/\1:/ H $ { - s/.*/ / + s/.*/'"$tab"'/ G p }' >> "$depfile" @@ -478,7 +500,7 @@ dashmstdout) shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -498,15 +520,14 @@ dashmstdout) done test -z "$dashmflag" && dashmflag=-M - # Require at least two characters before searching for `:' + # Require at least two characters before searching for ':' # in the target name. This is to cope with DOS-style filenames: - # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. + # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. "$@" $dashmflag | - sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" + sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" - tr ' ' ' -' < "$tmpdepfile" | \ + tr ' ' "$nl" < "$tmpdepfile" | \ ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" @@ -562,8 +583,7 @@ makedepend) # makedepend may prepend the VPATH from the source file name to the object. # No need to regex-escape $object, excess matching of '.' is harmless. sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' ' -' | \ + sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \ ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" @@ -583,7 +603,7 @@ cpp) shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -652,8 +672,8 @@ msvisualcpp) sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" - sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" - echo " " >> "$depfile" + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile" + echo "$tab" >> "$depfile" sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" rm -f "$tmpdepfile" ;; diff --git a/build-aux/ltmain.sh b/build-aux/ltmain.sh index c2852d8..0096fe6 100644 --- a/build-aux/ltmain.sh +++ b/build-aux/ltmain.sh @@ -70,7 +70,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu1 +# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu2 # automake: $automake_version # autoconf: $autoconf_version # @@ -80,7 +80,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION="2.4.2 Debian-2.4.2-1ubuntu1" +VERSION="2.4.2 Debian-2.4.2-1ubuntu2" TIMESTAMP="" package_revision=1.3337 diff --git a/config.h.in b/config.h.in index 4aba5bc..a7745b9 100644 --- a/config.h.in +++ b/config.h.in @@ -79,6 +79,11 @@ /* Version number of package */ #undef VERSION +/* Enable large inode numbers on Mac OS X 10.5. */ +#ifndef _DARWIN_USE_64_BIT_INODE +# define _DARWIN_USE_64_BIT_INODE 1 +#endif + /* Number of bits in a file offset, on hosts where this is settable. */ #undef _FILE_OFFSET_BITS diff --git a/configure b/configure index 1fdaa44..e08d256 100755 --- a/configure +++ b/configure @@ -1,13 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for gupnp 0.18.0. +# Generated by GNU Autoconf 2.69 for gupnp 0.19.1. # # Report bugs to . # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -136,6 +134,31 @@ export LANGUAGE # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -169,7 +192,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -222,21 +246,25 @@ IFS=$as_save_IFS if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - # Preserve -v and -x to the replacement shell. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; - esac - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -340,6 +368,14 @@ $as_echo X"$as_dir" | } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -461,6 +497,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -495,16 +535,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -516,28 +556,8 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -547,6 +567,66 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" SHELL=${CONFIG_SHELL-/bin/sh} +as_awk_strverscmp=' + # Use only awk features that work with 7th edition Unix awk (1978). + # My, what an old awk you have, Mr. Solaris! + END { + while (length(v1) && length(v2)) { + # Set d1 to be the next thing to compare from v1, and likewise for d2. + # Normally this is a single character, but if v1 and v2 contain digits, + # compare them as integers and fractions as strverscmp does. + if (v1 ~ /^[0-9]/ && v2 ~ /^[0-9]/) { + # Split v1 and v2 into their leading digit string components d1 and d2, + # and advance v1 and v2 past the leading digit strings. + for (len1 = 1; substr(v1, len1 + 1) ~ /^[0-9]/; len1++) continue + for (len2 = 1; substr(v2, len2 + 1) ~ /^[0-9]/; len2++) continue + d1 = substr(v1, 1, len1); v1 = substr(v1, len1 + 1) + d2 = substr(v2, 1, len2); v2 = substr(v2, len2 + 1) + if (d1 ~ /^0/) { + if (d2 ~ /^0/) { + # Compare two fractions. + while (d1 ~ /^0/ && d2 ~ /^0/) { + d1 = substr(d1, 2); len1-- + d2 = substr(d2, 2); len2-- + } + if (len1 != len2 && ! (len1 && len2 && substr(d1, 1, 1) == substr(d2, 1, 1))) { + # The two components differ in length, and the common prefix + # contains only leading zeros. Consider the longer to be less. + d1 = -len1 + d2 = -len2 + } else { + # Otherwise, compare as strings. + d1 = "x" d1 + d2 = "x" d2 + } + } else { + # A fraction is less than an integer. + exit 1 + } + } else { + if (d2 ~ /^0/) { + # An integer is greater than a fraction. + exit 2 + } else { + # Compare two integers. + d1 += 0 + d2 += 0 + } + } + } else { + # The normal case, without worrying about digits. + d1 = substr(v1, 1, 1); v1 = substr(v1, 2) + d2 = substr(v2, 1, 1); v2 = substr(v2, 2) + } + if (d1 < d2) exit 1 + if (d1 > d2) exit 2 + } + # Beware Solaris /usr/xgp4/bin/awk (at least through Solaris 10), + # which mishandles some comparisons of empty strings to integers. + if (length(v2)) exit 1 + if (length(v1)) exit 2 + } +' test -n "$DJDIR" || exec 7<&0 &1 @@ -571,8 +651,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='gupnp' PACKAGE_TARNAME='gupnp' -PACKAGE_VERSION='0.18.0' -PACKAGE_STRING='gupnp 0.18.0' +PACKAGE_VERSION='0.19.1' +PACKAGE_STRING='gupnp 0.19.1' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gupnp&component=gupnp' PACKAGE_URL='http://www.gupnp.org/' @@ -634,6 +714,9 @@ HTML_DIR GTKDOC_MKPDF GTKDOC_REBASE GTKDOC_CHECK +HAVE_VAPIGEN_FALSE +HAVE_VAPIGEN_TRUE +VAPIGEN HAVE_INTROSPECTION_FALSE HAVE_INTROSPECTION_TRUE INTROSPECTION_MAKEFILE @@ -1290,8 +1373,6 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1377,7 +1458,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures gupnp 0.18.0 to adapt to many kinds of systems. +\`configure' configures gupnp 0.19.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1448,7 +1529,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gupnp 0.18.0:";; + short | recursive ) echo "Configuration of gupnp 0.19.1:";; esac cat <<\_ACEOF @@ -1590,10 +1671,10 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gupnp configure 0.18.0 -generated by GNU Autoconf 2.68 +gupnp configure 0.19.1 +generated by GNU Autoconf 2.69 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1779,7 +1860,7 @@ $as_echo "$ac_try_echo"; } >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -1868,8 +1949,8 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by gupnp $as_me 0.18.0, which was -generated by GNU Autoconf 2.68. Invocation command line was +It was created by gupnp $as_me 0.19.1, which was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2404,7 +2485,7 @@ case $as_dir/ in #(( # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -2573,7 +2654,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2613,7 +2694,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2664,7 +2745,7 @@ do test -z "$as_dir" && as_dir=. for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( 'mkdir (GNU coreutils) '* | \ 'mkdir (coreutils) '* | \ @@ -2717,7 +2798,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2803,7 +2884,7 @@ fi # Define the identity of the package. PACKAGE='gupnp' - VERSION='0.18.0' + VERSION='0.19.1' cat >>confdefs.h <<_ACEOF @@ -3011,7 +3092,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3051,7 +3132,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3104,7 +3185,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3145,7 +3226,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -3203,7 +3284,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3247,7 +3328,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3693,8 +3774,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -4125,7 +4205,7 @@ do for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + as_fn_executable_p "$ac_path_GREP" || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -4191,7 +4271,7 @@ do for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -4765,6 +4845,8 @@ _ACEOF esac rm -rf conftest* fi + + fi @@ -4886,7 +4968,7 @@ do for ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue + as_fn_executable_p "$ac_path_SED" || continue # Check for GNU ac_path_SED and select it if it is found. # Check for GNU $ac_path_SED case `"$ac_path_SED" --version 2>&1` in @@ -4965,7 +5047,7 @@ do for ac_prog in fgrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue + as_fn_executable_p "$ac_path_FGREP" || continue # Check for GNU ac_path_FGREP and select it if it is found. # Check for GNU $ac_path_FGREP case `"$ac_path_FGREP" --version 2>&1` in @@ -5221,7 +5303,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5265,7 +5347,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5689,7 +5771,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5729,7 +5811,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OBJDUMP="objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6035,7 +6117,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6075,7 +6157,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DLLTOOL="dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6178,7 +6260,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AR="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6222,7 +6304,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_AR="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6347,7 +6429,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6387,7 +6469,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6446,7 +6528,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6486,7 +6568,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7135,7 +7217,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7175,7 +7257,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7255,7 +7337,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7295,7 +7377,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7347,7 +7429,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7387,7 +7469,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_NMEDIT="nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7439,7 +7521,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_LIPO="${ac_tool_prefix}lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7479,7 +7561,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_LIPO="lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7531,7 +7613,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL="${ac_tool_prefix}otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7571,7 +7653,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL="otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7623,7 +7705,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7663,7 +7745,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL64="otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -11928,7 +12010,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -11971,7 +12053,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -12133,14 +12215,14 @@ if test -n "$LIBGUPNP_CFLAGS"; then { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.24.0 \\ gio-2.0 \\ gmodule-2.0 \\ - gssdp-1.0 >= 0.11.2 \\ + gssdp-1.0 >= 0.13.0 \\ libsoup-2.4 >= 2.28.2 \\ libxml-2.0 \\ \$UUID\""; } >&5 ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.24.0 \ gio-2.0 \ gmodule-2.0 \ - gssdp-1.0 >= 0.11.2 \ + gssdp-1.0 >= 0.13.0 \ libsoup-2.4 >= 2.28.2 \ libxml-2.0 \ $UUID") 2>&5 @@ -12150,7 +12232,7 @@ if test -n "$LIBGUPNP_CFLAGS"; then pkg_cv_LIBGUPNP_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.24.0 \ gio-2.0 \ gmodule-2.0 \ - gssdp-1.0 >= 0.11.2 \ + gssdp-1.0 >= 0.13.0 \ libsoup-2.4 >= 2.28.2 \ libxml-2.0 \ $UUID" 2>/dev/null` @@ -12168,14 +12250,14 @@ if test -n "$LIBGUPNP_LIBS"; then { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.24.0 \\ gio-2.0 \\ gmodule-2.0 \\ - gssdp-1.0 >= 0.11.2 \\ + gssdp-1.0 >= 0.13.0 \\ libsoup-2.4 >= 2.28.2 \\ libxml-2.0 \\ \$UUID\""; } >&5 ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.24.0 \ gio-2.0 \ gmodule-2.0 \ - gssdp-1.0 >= 0.11.2 \ + gssdp-1.0 >= 0.13.0 \ libsoup-2.4 >= 2.28.2 \ libxml-2.0 \ $UUID") 2>&5 @@ -12185,7 +12267,7 @@ if test -n "$LIBGUPNP_LIBS"; then pkg_cv_LIBGUPNP_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.24.0 \ gio-2.0 \ gmodule-2.0 \ - gssdp-1.0 >= 0.11.2 \ + gssdp-1.0 >= 0.13.0 \ libsoup-2.4 >= 2.28.2 \ libxml-2.0 \ $UUID" 2>/dev/null` @@ -12212,7 +12294,7 @@ fi LIBGUPNP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.24.0 \ gio-2.0 \ gmodule-2.0 \ - gssdp-1.0 >= 0.11.2 \ + gssdp-1.0 >= 0.13.0 \ libsoup-2.4 >= 2.28.2 \ libxml-2.0 \ $UUID" 2>&1` @@ -12220,7 +12302,7 @@ fi LIBGUPNP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.24.0 \ gio-2.0 \ gmodule-2.0 \ - gssdp-1.0 >= 0.11.2 \ + gssdp-1.0 >= 0.13.0 \ libsoup-2.4 >= 2.28.2 \ libxml-2.0 \ $UUID" 2>&1` @@ -12231,7 +12313,7 @@ fi as_fn_error $? "Package requirements (glib-2.0 >= 2.24.0 \ gio-2.0 \ gmodule-2.0 \ - gssdp-1.0 >= 0.11.2 \ + gssdp-1.0 >= 0.13.0 \ libsoup-2.4 >= 2.28.2 \ libxml-2.0 \ $UUID) were not met: @@ -12766,6 +12848,90 @@ fi +# vapigen +if test "x$found_introspection" = "xyes"; then : + + # Extract the first word of "vapigen", so it can be a program name with args. +set dummy vapigen; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_VAPIGEN+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $VAPIGEN in + [\\/]* | ?:[\\/]*) + ac_cv_path_VAPIGEN="$VAPIGEN" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_VAPIGEN="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +VAPIGEN=$ac_cv_path_VAPIGEN +if test -n "$VAPIGEN"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $VAPIGEN" >&5 +$as_echo "$VAPIGEN" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + if test -z "$VAPIGEN"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No Vala API Generator found. You will not be able to generate .vapi files." >&5 +$as_echo "$as_me: WARNING: No Vala API Generator found. You will not be able to generate .vapi files." >&2;} +else + if test -n "0.14"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking $VAPIGEN is at least version 0.14" >&5 +$as_echo_n "checking $VAPIGEN is at least version 0.14... " >&6; } + am__vapigen_version=`$VAPIGEN --version | sed 's/Vala API Generator *//'` + as_arg_v1=0.14 +as_arg_v2="$am__vapigen_version" +awk "$as_awk_strverscmp" v1="$as_arg_v1" v2="$as_arg_v2" /dev/null +case $? in #( + 1) : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } ;; #( + 0) : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } ;; #( + 2) : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Vala API Generator 0.14 not found." >&5 +$as_echo "$as_me: WARNING: Vala API Generator 0.14 not found." >&2;} ;; #( + *) : + ;; +esac +fi +fi + + + +fi + if test "x$VAPIGEN" != "x"; then + HAVE_VAPIGEN_TRUE= + HAVE_VAPIGEN_FALSE='#' +else + HAVE_VAPIGEN_TRUE='#' + HAVE_VAPIGEN_FALSE= +fi + + # Gtk-doc @@ -12788,7 +12954,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -12830,7 +12996,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GTKDOC_REBASE="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -12874,7 +13040,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GTKDOC_MKPDF="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -13089,7 +13255,7 @@ fi -ac_config_files="$ac_config_files Makefile libgupnp/Makefile examples/Makefile tools/Makefile tests/Makefile tests/gtest/Makefile doc/Makefile doc/version.xml gupnp-1.0.pc gupnp-1.0-uninstalled.pc" +ac_config_files="$ac_config_files Makefile libgupnp/Makefile examples/Makefile tools/Makefile tests/Makefile tests/gtest/Makefile doc/Makefile doc/version.xml vala/Makefile gupnp-1.0.pc gupnp-1.0-uninstalled.pc" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -13244,6 +13410,10 @@ if test -z "${HAVE_INTROSPECTION_TRUE}" && test -z "${HAVE_INTROSPECTION_FALSE}" as_fn_error $? "conditional \"HAVE_INTROSPECTION\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${HAVE_VAPIGEN_TRUE}" && test -z "${HAVE_VAPIGEN_FALSE}"; then + as_fn_error $? "conditional \"HAVE_VAPIGEN\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then as_fn_error $? "conditional \"ENABLE_GTK_DOC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -13562,16 +13732,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -13631,28 +13801,16 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -13673,8 +13831,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gupnp $as_me 0.18.0, which was -generated by GNU Autoconf 2.68. Invocation command line was +This file was extended by gupnp $as_me 0.19.1, which was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -13740,11 +13898,11 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -gupnp config.status 0.18.0 -configured by $0, generated by GNU Autoconf 2.68, +gupnp config.status 0.19.1 +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -13835,7 +13993,7 @@ fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' @@ -14157,6 +14315,7 @@ do "tests/gtest/Makefile") CONFIG_FILES="$CONFIG_FILES tests/gtest/Makefile" ;; "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; "doc/version.xml") CONFIG_FILES="$CONFIG_FILES doc/version.xml" ;; + "vala/Makefile") CONFIG_FILES="$CONFIG_FILES vala/Makefile" ;; "gupnp-1.0.pc") CONFIG_FILES="$CONFIG_FILES gupnp-1.0.pc" ;; "gupnp-1.0-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES gupnp-1.0-uninstalled.pc" ;; diff --git a/configure.ac b/configure.ac index 8fbb92e..b0c157a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ([2.64]) AC_INIT([gupnp], - [0.18.0], + [0.19.1], [http://bugzilla.gnome.org/enter_bug.cgi?product=gupnp&component=gupnp], [gupnp], [http://www.gupnp.org/]) @@ -50,7 +50,7 @@ esac PKG_CHECK_MODULES(LIBGUPNP, glib-2.0 >= 2.24.0 \ gio-2.0 \ gmodule-2.0 \ - gssdp-1.0 >= 0.11.2 \ + gssdp-1.0 >= 0.13.0 \ libsoup-2.4 >= 2.28.2 \ libxml-2.0 \ $UUID) @@ -129,6 +129,14 @@ fi GOBJECT_INTROSPECTION_CHECK([0.6.4]) +# vapigen +AS_IF([test "x$found_introspection" = "xyes"], + [ + VALA_PROG_VAPIGEN([0.14]) + ] +) +AM_CONDITIONAL([HAVE_VAPIGEN], [test "x$VAPIGEN" != "x"]) + # Gtk-doc GTK_DOC_CHECK([1.0]) @@ -141,6 +149,7 @@ tests/Makefile tests/gtest/Makefile doc/Makefile doc/version.xml +vala/Makefile gupnp-1.0.pc gupnp-1.0-uninstalled.pc ]) diff --git a/doc/Makefile.in b/doc/Makefile.in index 6794776..9062500 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -21,6 +21,23 @@ # Everything below here is generic # #################################### VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -48,7 +65,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -63,6 +80,11 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -156,6 +178,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NETLINK = @USE_NETLINK@ +VAPIGEN = @VAPIGEN@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ diff --git a/doc/html/GUPnPContext.html b/doc/html/GUPnPContext.html index 8f0a222..72ee0e9 100644 --- a/doc/html/GUPnPContext.html +++ b/doc/html/GUPnPContext.html @@ -44,18 +44,18 @@

Synopsis

struct              GUPnPContext;
-GUPnPContext *      gupnp_context_new                   (GMainContext *main_context,
+GUPnPContext *      gupnp_context_new                   (GMainContext *main_context,
                                                          const char *interface,
-                                                         guint port,
-                                                         GError **error);
+                                                         guint port,
+                                                         GError **error);
 const char *        gupnp_context_get_host_ip           (GUPnPContext *context);
-guint               gupnp_context_get_port              (GUPnPContext *context);
+guint               gupnp_context_get_port              (GUPnPContext *context);
 SoupServer *        gupnp_context_get_server            (GUPnPContext *context);
 SoupSession *       gupnp_context_get_session           (GUPnPContext *context);
 void                gupnp_context_set_subscription_timeout
                                                         (GUPnPContext *context,
-                                                         guint timeout);
-guint               gupnp_context_get_subscription_timeout
+                                                         guint timeout);
+guint               gupnp_context_get_subscription_timeout
                                                         (GUPnPContext *context);
 const char *        gupnp_context_get_default_language  (GUPnPContext *context);
 void                gupnp_context_set_default_language  (GUPnPContext *context,
@@ -63,10 +63,10 @@ const char *        void                gupnp_context_host_path             (GUPnPContext *context,
                                                          const char *local_path,
                                                          const char *server_path);
-gboolean            gupnp_context_host_path_for_agent   (GUPnPContext *context,
+gboolean            gupnp_context_host_path_for_agent   (GUPnPContext *context,
                                                          const char *local_path,
                                                          const char *server_path,
-                                                         GRegex *user_agent);
+                                                         GRegex *user_agent);
 void                gupnp_context_unhost_path           (GUPnPContext *context,
                                                          const char *server_path);
@@ -74,8 +74,8 @@ const char *

Object Hierarchy

-  GObject
-   +----GSSDPClient
+  GObject
+   +----GSSDPClient
          +----GUPnPContext
@@ -83,16 +83,16 @@ const char *

Implemented Interfaces

GUPnPContext implements - GInitable.

+ GInitable.

Properties

-  "default-language"         gchar*                : Read / Write / Construct
-  "port"                     guint                 : Read / Write / Construct Only
+  "default-language"         gchar*                : Read / Write / Construct
+  "port"                     guint                 : Read / Write / Construct Only
   "server"                   SoupServer*           : Read
   "session"                  SoupSession*          : Read
-  "subscription-timeout"     guint                 : Read / Write / Construct Only
+  "subscription-timeout"     guint                 : Read / Write / Construct Only
@@ -119,10 +119,10 @@ functions below.

gupnp_context_new ()

-
GUPnPContext *      gupnp_context_new                   (GMainContext *main_context,
+
GUPnPContext *      gupnp_context_new                   (GMainContext *main_context,
                                                          const char *interface,
-                                                         guint port,
-                                                         GError **error);

+                                                         guint port,
+                                                         GError **error);

Create a new GUPnPContext with the specified main_context, interface and port. @@ -132,12 +132,15 @@ Create a new

main_context :

-Deprecated: 0.17.2: Always set to NULL. If you want to use -a different context, use g_main_context_push_thread_default(). +Deprecated: 0.17.2: Always set to NULL. If you +want to use a different context, use g_main_context_push_thread_default(). [allow-none] +

interface :

-The network interface to use, or NULL to auto-detect. +The network interface to use, or NULL to +auto-detect. [allow-none] +

port :

@@ -145,12 +148,12 @@ a different context, use error :

-A location to store a GError, or NULL +A location to store a GError, or NULL

Returns :

-A new GUPnPContext object, or NULL on an error +A new GUPnPContext object, or NULL on an error
@@ -162,8 +165,8 @@ a different context, use

Warning

gupnp_context_get_host_ip has been deprecated since version 0.12.7 and should not be used in newly-written code. The "host-ip" property has moved to the base class -GSSDPClient so newer applications should use -gssdp_client_get_host_ip instead.

+GSSDPClient so newer applications should use +gssdp_client_get_host_ip instead.

Get the IP address we advertise ourselves as using. @@ -186,7 +189,7 @@ Get the IP address we advertise ourselves as using.

gupnp_context_get_port ()

-
guint               gupnp_context_get_port              (GUPnPContext *context);
+
guint               gupnp_context_get_port              (GUPnPContext *context);

Get the port that the SOAP server is running on.

@@ -257,7 +260,7 @@ this when finished. [

gupnp_context_set_subscription_timeout ()

void                gupnp_context_set_subscription_timeout
                                                         (GUPnPContext *context,
-                                                         guint timeout);
+ guint timeout);

Sets the event subscription timeout to timeout. Use 0 if you don't want subscriptions to time out. Note that any client side subscriptions @@ -281,7 +284,7 @@ will automatically be renewed.

gupnp_context_get_subscription_timeout ()

-
guint               gupnp_context_get_subscription_timeout
+
guint               gupnp_context_get_subscription_timeout
                                                         (GUPnPContext *context);

 

 Get the event subscription timeout (in seconds), or 0 meaning there is no
@@ -382,10 +385,10 @@ specified in the request's Accept-Language header.
 

 

 
gupnp_context_host_path_for_agent ()

-
gboolean            gupnp_context_host_path_for_agent   (GUPnPContext *context,
+
gboolean            gupnp_context_host_path_for_agent   (GUPnPContext *context,
                                                          const char *local_path,
                                                          const char *server_path,
-                                                         GRegex *user_agent);

+                                                         GRegex *user_agent);

 

 Use this method to serve different local path to specific user-agent(s). The
 path server_path must already be hosted by context.
@@ -408,12 +411,12 @@ path server_path must already be hosted
 
 
 
user_agent :

-The user-agent as a GRegex.
+The user-agent as a GRegex.
 
 
 
Returns :

 
-TRUE on success, FALSE otherwise.
+TRUE on success, FALSE otherwise.
 
 
 

@@ -446,7 +449,7 @@ Stop hosting the file or folder at server_path
Property Details

 

 
The "default-language" property

-
  "default-language"         gchar*                : Read / Write / Construct

+
  "default-language"         gchar*                : Read / Write / Construct

 

 The content of the Content-Language header id the client
 sends Accept-Language and no language-specific pages to serve
@@ -457,7 +460,7 @@ exist. The property defaults to 'en'.
 

 

 
The "port" property

-
  "port"                     guint                 : Read / Write / Construct Only

+
  "port"                     guint                 : Read / Write / Construct Only

 

 The port to run on. Set to 0 if you don't care what port to run on.
 

@@ -482,7 +485,7 @@ The SoupSession object used by GUPnP.
 

 

 
The "subscription-timeout" property

-
  "subscription-timeout"     guint                 : Read / Write / Construct Only

+
  "subscription-timeout"     guint                 : Read / Write / Construct Only

 

 The preferred subscription timeout: the number of seconds after
 which subscriptions are renewed. Set to '0' if subscriptions
diff --git a/doc/html/GUPnPContextManager.html b/doc/html/GUPnPContextManager.html
index adbf182..40cb7a8 100644
--- a/doc/html/GUPnPContextManager.html
+++ b/doc/html/GUPnPContextManager.html
@@ -44,9 +44,9 @@
 

 
Synopsis

 
struct              GUPnPContextManager;
-GUPnPContextManager * gupnp_context_manager_new         (GMainContext *main_context,
-                                                         guint port);
-GUPnPContextManager * gupnp_context_manager_create      (guint port);
+GUPnPContextManager * gupnp_context_manager_new         (GMainContext *main_context,
+                                                         guint port);
+GUPnPContextManager * gupnp_context_manager_create      (guint port);
 void                gupnp_context_manager_manage_control_point
                                                         (GUPnPContextManager *manager,
                                                          GUPnPControlPoint *control_point);
@@ -58,22 +58,22 @@
 

 
Object Hierarchy

 
-  GObject
+  GObject
    +----GUPnPContextManager
 

 

 

 
Properties

 
-  "main-context"             gpointer              : Read / Write / Construct Only
-  "port"                     guint                 : Read / Write / Construct Only
+  "main-context"             gpointer              : Read / Write / Construct Only
+  "port"                     guint                 : Read / Write / Construct Only
 

 

 

 
Signals

 
-  "context-available"                              : Run Last
-  "context-unavailable"                            : Run First
+  "context-available"                              : Run Last
+  "context-unavailable"                            : Run First
 

 

 

@@ -97,8 +97,8 @@ functions below.
 

 

 
gupnp_context_manager_new ()

-
GUPnPContextManager * gupnp_context_manager_new         (GMainContext *main_context,
-                                                         guint port);

+
GUPnPContextManager * gupnp_context_manager_new         (GMainContext *main_context,
+                                                         guint port);

 

 
Warning

 
gupnp_context_manager_new has been deprecated since version 0.17.2 and should not be used in newly-written code. Use gupnp_context_manager_create().

@@ -111,9 +111,9 @@ Same as main_context :

-Deprecated: 0.17.2: NULL. If you want to use
+Deprecated: 0.17.2: NULL. If you want to use
 a different main context use
-g_main_context_push_thread_default() instead. [allow-none]
+g_main_context_push_thread_default() instead. [allow-none]
 
 
 
@@ -131,7 +131,7 @@ a different main context use
 

 

 
gupnp_context_manager_create ()

-
GUPnPContextManager * gupnp_context_manager_create      (guint port);

+
GUPnPContextManager * gupnp_context_manager_create      (guint port);

 

 Factory-method to create a new GUPnPContextManager. The final type of the
 GUPnPContextManager depends on the compile-time selection or - in case of
@@ -214,13 +214,13 @@ usually want to call this function from
 
Property Details

 

 
The "main-context" property

-
  "main-context"             gpointer              : Read / Write / Construct Only

+
  "main-context"             gpointer              : Read / Write / Construct Only

 
GMainContext to pass to created GUPnPContext objects.

 

 

 

 
The "port" property

-
  "port"                     guint                 : Read / Write / Construct Only

+
  "port"                     guint                 : Read / Write / Construct Only

 

 Port the contexts listen on, or 0 if you don't care what
 port is used by GUPnPContext objects created by this object.
@@ -234,7 +234,7 @@ port is used by 
The "context-available" signal

 
void                user_function                      (GUPnPContextManager *context_manager,
                                                         GUPnPContext        *context,
-                                                        gpointer             user_data)            : Run Last

+                                                        gpointer             user_data)            : Run Last

 

 Signals the availability of new GUPnPContext.
 

@@ -262,7 +262,7 @@ Signals the availability of new 
The "context-unavailable" signal

 
void                user_function                      (GUPnPContextManager *context_manager,
                                                         GUPnPContext        *context,
-                                                        gpointer             user_data)            : Run First

+                                                        gpointer             user_data)            : Run First

Signals the unavailability of a GUPnPContext.

diff --git a/doc/html/GUPnPControlPoint.html b/doc/html/GUPnPControlPoint.html index f3aa9f1..a2d9fe2 100644 --- a/doc/html/GUPnPControlPoint.html +++ b/doc/html/GUPnPControlPoint.html @@ -52,17 +52,17 @@ GUPnPResourceFactory * gupnp_control_point_get_resource_factory (GUPnPControlPoint *control_point); GUPnPContext * gupnp_control_point_get_context (GUPnPControlPoint *control_point); -const GList * gupnp_control_point_list_device_proxies +const GList * gupnp_control_point_list_device_proxies (GUPnPControlPoint *control_point); -const GList * gupnp_control_point_list_service_proxies +const GList * gupnp_control_point_list_service_proxies (GUPnPControlPoint *control_point);

Object Hierarchy

-  GObject
-   +----GSSDPResourceBrowser
+  GObject
+   +----GSSDPResourceBrowser
          +----GUPnPControlPoint
@@ -75,17 +75,17 @@ const

Signals

-  "device-proxy-available"                         : Run Last
-  "device-proxy-unavailable"                       : Run Last
-  "service-proxy-available"                        : Run Last
-  "service-proxy-unavailable"                      : Run Last
+  "device-proxy-available"                         : Run Last
+  "device-proxy-unavailable"                       : Run Last
+  "service-proxy-available"                        : Run Last
+  "service-proxy-unavailable"                      : Run Last

Description

GUPnPControlPoint handles device and service discovery. After creating -a control point and activating it using gssdp_resource_browser_set_active(), +a control point and activating it using gssdp_resource_browser_set_active(), the ::device-proxy-available, ::service-proxy-available, ::device-proxy-unavailable and ::service-proxy-unavailable signals will be emitted whenever the availability of a device or service matching @@ -223,10 +223,10 @@ Get the

gupnp_control_point_list_device_proxies ()

-
const GList *       gupnp_control_point_list_device_proxies
+
const GList *       gupnp_control_point_list_device_proxies
                                                         (GUPnPControlPoint *control_point);

 

-Get the GList of discovered GUPnPDeviceProxy objects. Do not free the list
+Get the GList of discovered GUPnPDeviceProxy objects. Do not free the list
 nor its elements.
 

 

@@ -239,7 +239,7 @@ nor its elements.
 
-
@@ -249,10 +249,10 @@ nor its elements.
 

 
gupnp_control_point_list_service_proxies ()

-
const GList *       gupnp_control_point_list_service_proxies
+
const GList *       gupnp_control_point_list_service_proxies
                                                         (GUPnPControlPoint *control_point);

 

-Get the GList of discovered GUPnPServiceProxy objects. Do not free the
+Get the GList of discovered GUPnPServiceProxy objects. Do not free the
 list nor its elements.
 

 

 

 
Returns :
a GList of
+a GList of
 GUPnPDeviceProxy objects. [element-type GUPnP.DeviceProxy][transfer none]
 
 

 

@@ -265,7 +265,7 @@ list nor its elements.
 
-
@@ -289,7 +289,7 @@ The resource factory to use. Set to NULL for default factory.
 
The "device-proxy-available" signal
void                user_function                      (GUPnPControlPoint *control_point,
                                                         GUPnPDeviceProxy  *proxy,
-                                                        gpointer           user_data)          : Run Last

+                                                        gpointer           user_data)          : Run Last

 The ::device-proxy-available signal is emitted whenever a new
 device has become available.
@@ -318,7 +318,7 @@ device has become available.
 
The "device-proxy-unavailable" signal
void                user_function                      (GUPnPControlPoint *control_point,
                                                         GUPnPDeviceProxy  *proxy,
-                                                        gpointer           user_data)          : Run Last

+                                                        gpointer           user_data)          : Run Last

 The ::device-proxy-unavailable signal is emitted whenever a
 device is not available any more.
@@ -347,7 +347,7 @@ device is not available any more.
 
The "service-proxy-available" signal
void                user_function                      (GUPnPControlPoint *control_point,
                                                         GUPnPServiceProxy *proxy,
-                                                        gpointer           user_data)          : Run Last

+                                                        gpointer           user_data)          : Run Last

 The ::service-proxy-available signal is emitted whenever a new
 service has become available.
@@ -376,7 +376,7 @@ service has become available.
 
The "service-proxy-unavailable" signal
void                user_function                      (GUPnPControlPoint *control_point,
                                                         GUPnPServiceProxy *proxy,
-                                                        gpointer           user_data)          : Run Last

+                                                        gpointer           user_data)          : Run Last

 The ::service-proxy-unavailable signal is emitted whenever a
 service is not available any more.
diff --git a/doc/html/GUPnPDevice.html b/doc/html/GUPnPDevice.html
index 8c7b8fc..ec1c3e7 100644
--- a/doc/html/GUPnPDevice.html
+++ b/doc/html/GUPnPDevice.html
@@ -47,7 +47,7 @@
 

 
Object Hierarchy

 
-  GObject
+  GObject
    +----GUPnPDeviceInfo
          +----GUPnPDevice
                +----GUPnPRootDevice
diff --git a/doc/html/GUPnPDeviceInfo.html b/doc/html/GUPnPDeviceInfo.html
index 9d87358..a8caa66 100644
--- a/doc/html/GUPnPDeviceInfo.html
+++ b/doc/html/GUPnPDeviceInfo.html
@@ -67,22 +67,22 @@ const char *        int requested_depth,
                                                          int requested_width,
                                                          int requested_height,
-                                                         gboolean prefer_bigger,
+                                                         gboolean prefer_bigger,
                                                          char **mime_type,
                                                          int *depth,
                                                          int *width,
                                                          int *height);
-GList *             gupnp_device_info_list_dlna_capabilities
+GList *             gupnp_device_info_list_dlna_capabilities
                                                         (GUPnPDeviceInfo *info);
 char *              gupnp_device_info_get_description_value
                                                         (GUPnPDeviceInfo *info,
                                                          const char *element);
-GList *             gupnp_device_info_list_devices      (GUPnPDeviceInfo *info);
-GList *             gupnp_device_info_list_device_types (GUPnPDeviceInfo *info);
+GList *             gupnp_device_info_list_devices      (GUPnPDeviceInfo *info);
+GList *             gupnp_device_info_list_device_types (GUPnPDeviceInfo *info);
 GUPnPDeviceInfo *   gupnp_device_info_get_device        (GUPnPDeviceInfo *info,
                                                          const char *type);
-GList *             gupnp_device_info_list_services     (GUPnPDeviceInfo *info);
-GList *             gupnp_device_info_list_service_types
+GList *             gupnp_device_info_list_services     (GUPnPDeviceInfo *info);
+GList *             gupnp_device_info_list_service_types
                                                         (GUPnPDeviceInfo *info);
 GUPnPServiceInfo *  gupnp_device_info_get_service       (GUPnPDeviceInfo *info,
                                                          const char *type);
@@ -91,7 +91,7 @@ const char *        
 
Object Hierarchy

 
-  GObject
+  GObject
    +----GUPnPDeviceInfo
          +----GUPnPDevice
          +----GUPnPDeviceProxy
@@ -101,13 +101,13 @@ const char *        
Properties

 
   "context"                  GUPnPContext*         : Read / Write / Construct Only
-  "device-type"              gchar*                : Read / Write / Construct Only
+  "device-type"              gchar*                : Read / Write / Construct Only
   "document"                 GUPnPXMLDoc*          : Write / Construct Only
-  "element"                  gpointer              : Write / Construct Only
-  "location"                 gchar*                : Read / Write / Construct Only
+  "element"                  gpointer              : Write / Construct Only
+  "location"                 gchar*                : Read / Write / Construct Only
   "resource-factory"         GUPnPResourceFactory*  : Read / Write / Construct Only
-  "udn"                      gchar*                : Read / Write / Construct Only
-  "url-base"                 gpointer              : Read / Write / Construct Only
+  "udn"                      gchar*                : Read / Write / Construct Only
+  "url-base"                 SoupURI*              : Read / Write / Construct Only
 

 

@@ -257,7 +257,7 @@ Get the UPnP device type.
 
 

-
+

 

 
Returns :
a GList
+a GList
 of GUPnPServiceProxy objects. [element-type GUPnP.ServiceProxy][transfer none]
 
 

 
 
 
 
 
 
 
 
 

 
Returns :
A constant string, or NULL.A constant string, or NULL.
 

 
 

@@ -279,7 +279,7 @@ Get the friendly name of the device.
 
 
 
Returns :

-A string, or NULL. g_free() after use.
+A string, or NULL. g_free() after use.
@@ -301,7 +301,7 @@ Get the manufacturer of the device.

Returns :

-A string, or NULL. g_free() after use. +A string, or NULL. g_free() after use.
@@ -324,7 +324,7 @@ Get a URL pointing to the manufacturer's website.

Returns :

-A string, or NULL. g_free() after use. +A string, or NULL. g_free() after use. @@ -347,7 +347,7 @@ Get the description of the device model.

Returns :

-A string, or NULL. g_free() after use. +A string, or NULL. g_free() after use. @@ -369,7 +369,7 @@ Get the model name of the device.

Returns :

-A string, or NULL. g_free() after use. +A string, or NULL. g_free() after use. @@ -391,7 +391,7 @@ Get the model number of the device.

Returns :

-A string, or NULL. g_free() after use. +A string, or NULL. g_free() after use. @@ -413,7 +413,7 @@ Get a URL pointing to the device model's website.

Returns :

-A string, or NULL. g_free() after use. +A string, or NULL. g_free() after use. @@ -435,7 +435,7 @@ Get the serial number of the device.

Returns :

-A string, or NULL. g_free() after use. +A string, or NULL. g_free() after use. @@ -459,7 +459,7 @@ administration.

Returns :

-A string, or NULL. g_free() after use. +A string, or NULL. g_free() after use. @@ -481,7 +481,7 @@ Get the Universal Product Code of the device.

Returns :

-A string, or NULL. g_free() after use. +A string, or NULL. g_free() after use. @@ -494,14 +494,14 @@ Get the Universal Product Code of the device. int requested_depth, int requested_width, int requested_height, - gboolean prefer_bigger, + gboolean prefer_bigger, char **mime_type, int *depth, int *width, int *height);

Get a URL pointing to the icon most closely matching the -given criteria, or NULL. If requested_mime_type is set, only icons with +given criteria, or NULL. If requested_mime_type is set, only icons with this mime type will be returned. If requested_depth is set, only icons with this or lower depth will be returned. If requested_width and/or requested_height are set, only icons that are this size or smaller are @@ -519,7 +519,7 @@ will be returned. The returned strings should be freed.

requested_mime_type :

The requested file -format, or NULL for any. [allow-none][transfer none] +format, or NULL for any. [allow-none][transfer none] @@ -537,37 +537,37 @@ format, or prefer_bigger :

-TRUE if a bigger, rather than a smaller icon should be +TRUE if a bigger, rather than a smaller icon should be returned if no exact match could be found

mime_type :

The location where to store the the format -of the returned icon, or NULL. The returned string should be freed after +of the returned icon, or NULL. The returned string should be freed after use. [out][allow-none]

depth :

(out) (allow-none) : The location where to store the depth of the -returned icon, or NULL +returned icon, or NULL

width :

(out) (allow-none) : The location where to store the width of the -returned icon, or NULL +returned icon, or NULL

height :

(out) (allow-none) : The location where to store the height of the -returned icon, or NULL +returned icon, or NULL

Returns :

-a string, or NULL. g_free() after use. [transfer full] +a string, or NULL. g_free() after use. [transfer full] @@ -576,10 +576,10 @@ returned icon, or

gupnp_device_info_list_dlna_capabilities ()

-
GList *             gupnp_device_info_list_dlna_capabilities
+
GList *             gupnp_device_info_list_dlna_capabilities
                                                         (GUPnPDeviceInfo *info);

 

-Get a GList of strings that represent the device capabilities as announced 
+Get a GList of strings that represent the device capabilities as announced 
 in the device description file using the <dlna:X_DLNACAP> element.
 

 

@@ -592,8 +592,8 @@ in the device description file using the <dlna:X_DLNACAP> element.
 
-
@@ -624,7 +624,7 @@ in the device description file.
 
-
@@ -634,11 +634,11 @@ description doesn't contain the given element
 

 

 
gupnp_device_info_list_devices ()

-
GList *             gupnp_device_info_list_devices      (GUPnPDeviceInfo *info);

+
GList *             gupnp_device_info_list_devices      (GUPnPDeviceInfo *info);

 

-Get a GList of new objects implementing GUPnPDeviceInfo
+Get a GList of new objects implementing GUPnPDeviceInfo
 representing the devices directly contained in info. The returned list
-should be g_list_free()'d and the elements should be g_object_unref()'d.
+should be g_list_free()'d and the elements should be g_object_unref()'d.
 

 

 Note that devices are not cached internally, so that every time you
@@ -656,7 +656,7 @@ them.
 
 

-
@@ -666,9 +666,9 @@ new 
 

 
gupnp_device_info_list_device_types ()

-
GList *             gupnp_device_info_list_device_types (GUPnPDeviceInfo *info);

+
GList *             gupnp_device_info_list_device_types (GUPnPDeviceInfo *info);

 

-Get a GList of strings representing the types of the devices
+Get a GList of strings representing the types of the devices
 directly contained in info.
 

 

 

 
Returns :
a GList of newly allocated strings or
-NULL if the device description doesn't contain the <dlna:X_DLNACAP>
+a GList of newly allocated strings or
+NULL if the device description doesn't contain the <dlna:X_DLNACAP>
 element. [transfer full][element-type utf8]
 
 

 

 
Returns :
a newly allocated string or NULL if the device
+a newly allocated string or NULL if the device
 description doesn't contain the given element
 
 

 
Returns :
a GList of
+a GList of
 new GUPnPDeviceInfo objects. [element-type GUPnP.DeviceInfo][transfer full]
 
 

@@ -681,8 +681,8 @@ directly contained in info.
 
 
-
@@ -695,7 +695,7 @@ elements should be const char *type);
 

 Get the service with type type directly contained in info as
-a new object implementing GUPnPDeviceInfo, or NULL if no such device
+a new object implementing GUPnPDeviceInfo, or NULL if no such device
 was found. The returned object should be unreffed when done.
 

@@ -717,7 +717,7 @@ devices if it wishes to keep them around and re-use them.
 
 

-
@@ -726,11 +726,11 @@ devices if it wishes to keep them around and re-use them.
 

 
gupnp_device_info_list_services ()

-
GList *             gupnp_device_info_list_services     (GUPnPDeviceInfo *info);

+
GList *             gupnp_device_info_list_services     (GUPnPDeviceInfo *info);

 

-Get a GList of new objects implementing GUPnPServiceInfo representing the
+Get a GList of new objects implementing GUPnPServiceInfo representing the
 services directly contained in info. The returned list should be
-g_list_free()'d and the elements should be g_object_unref()'d.
+g_list_free()'d and the elements should be g_object_unref()'d.
 

 

 Note that services are not cached internally, so that every time you call
@@ -747,7 +747,7 @@ services if it wishes to keep them around and re-use them.
 
 

-
@@ -756,10 +756,10 @@ new 
 

 
gupnp_device_info_list_service_types ()

-
GList *             gupnp_device_info_list_service_types
+
GList *             gupnp_device_info_list_service_types
                                                         (GUPnPDeviceInfo *info);

 

-Get a GList of strings representing the types of the services
+Get a GList of strings representing the types of the services
 directly contained in info.
 

 

 
Returns :
A GList of strings. The
-elements should be g_free()'d and the list should be g_list_free()'d. [element-type utf8][transfer full]
+A GList of strings. The
+elements should be g_free()'d and the list should be g_list_free()'d. [element-type utf8][transfer full]
 
 

 
 

 
Returns :
A new GUPnPDeviceInfo. [transfer full]
+A new GUPnPDeviceInfo. [transfer full][allow-none]
 
 

 
 

 
Returns :
(element-type GUPnP.ServiceInfo) (transfer full) : A GList of
+(element-type GUPnP.ServiceInfo) (transfer full) : A GList of
 new GUPnPServiceInfo objects.
 

 

@@ -772,8 +772,8 @@ directly contained in info.
 
-
@@ -786,7 +786,7 @@ elements should be const char *type);
 

 Get the service with type type directly contained in info as a new object
-implementing GUPnPServiceInfo, or NULL if no such device was found. The
+implementing GUPnPServiceInfo, or NULL if no such device was found. The
 returned object should be unreffed when done.
 

@@ -827,7 +827,7 @@ The 
 
The "device-type" property

-
  "device-type"              gchar*                : Read / Write / Construct Only

+
  "device-type"              gchar*                : Read / Write / Construct Only

 The device type.
 

@@ -845,7 +845,7 @@ Private property.
 

 
The "element" property

-
  "element"                  gpointer              : Write / Construct Only

+
  "element"                  gpointer              : Write / Construct Only

 

 Private property.
 

@@ -854,7 +854,7 @@ Private property.
 

 

 
The "location" property

-
  "location"                 gchar*                : Read / Write / Construct Only

+
  "location"                 gchar*                : Read / Write / Construct Only

 

 The location of the device description file.
 

@@ -871,7 +871,7 @@ The resource factory to use. Set to NULL for default factory.
 

 

 
The "udn" property

-
  "udn"                      gchar*                : Read / Write / Construct Only

+
  "udn"                      gchar*                : Read / Write / Construct Only

 

 The UDN of this device.
 

@@ -880,7 +880,7 @@ The UDN of this device.
 

 

 
The "url-base" property

-
  "url-base"                 gpointer              : Read / Write / Construct Only

+
  "url-base"                 SoupURI*              : Read / Write / Construct Only

 

 The URL base (SoupURI).
 

diff --git a/doc/html/GUPnPDeviceProxy.html b/doc/html/GUPnPDeviceProxy.html
index f862d98..db7f5b0 100644
--- a/doc/html/GUPnPDeviceProxy.html
+++ b/doc/html/GUPnPDeviceProxy.html
@@ -45,7 +45,7 @@
 

 
Object Hierarchy

 
-  GObject
+  GObject
    +----GUPnPDeviceInfo
          +----GUPnPDeviceProxy
 

diff --git a/doc/html/GUPnPResourceFactory.html b/doc/html/GUPnPResourceFactory.html
index 30bee08..c75d278 100644
--- a/doc/html/GUPnPResourceFactory.html
+++ b/doc/html/GUPnPResourceFactory.html
@@ -46,15 +46,15 @@
 void                gupnp_resource_factory_register_resource_type
                                                         (GUPnPResourceFactory *factory,
                                                          const char *upnp_type,
-                                                         GType type);
-gboolean            gupnp_resource_factory_unregister_resource_type
+                                                         GType type);
+gboolean            gupnp_resource_factory_unregister_resource_type
                                                         (GUPnPResourceFactory *factory,
                                                          const char *upnp_type);
 void                gupnp_resource_factory_register_resource_proxy_type
                                                         (GUPnPResourceFactory *factory,
                                                          const char *upnp_type,
-                                                         GType type);
-gboolean            gupnp_resource_factory_unregister_resource_proxy_type
+                                                         GType type);
+gboolean            gupnp_resource_factory_unregister_resource_proxy_type
                                                         (GUPnPResourceFactory *factory,
                                                          const char *upnp_type);
 
@@ -62,7 +62,7 @@
 

 
Object Hierarchy

 
-  GObject
+  GObject
    +----GUPnPResourceFactory
 

 

@@ -71,9 +71,9 @@
 

 GUPnPResourceFactory objects are used by GUPnPControlPoint,
 GUPnPDeviceProxy and GUPnPDevice to create resource proxy and resource
-objects. Register UPnP type - GType pairs to have resource or resource proxy
-objects created with the specified GType whenever an object for a resource
-of the specified UPnP type is requested. The GTypes need
+objects. Register UPnP type - GType pairs to have resource or resource proxy
+objects created with the specified GType whenever an object for a resource
+of the specified UPnP type is requested. The GTypes need
 to be derived from the relevant resource or resource proxy type (e.g.
 a device proxy type needs to be derived from GUPnPDeviceProxy).
 

@@ -126,7 +126,7 @@ Get the default singleton void                gupnp_resource_factory_register_resource_type
                                                         (GUPnPResourceFactory *factory,
                                                          const char *upnp_type,
-                                                         GType type);
+                                                         GType type);
 

 Registers the GType type for the resource of UPnP type upnp_type. After
 this call, the factory factory will create object of GType type each time
@@ -157,7 +157,7 @@ a device or GUPNP_TYPE_SERVICE if its a service.
 

 

 
gupnp_resource_factory_unregister_resource_type ()

-
gboolean            gupnp_resource_factory_unregister_resource_type
+
gboolean            gupnp_resource_factory_unregister_resource_type
                                                         (GUPnPResourceFactory *factory,
                                                          const char *upnp_type);

 

@@ -177,7 +177,7 @@ Unregisters the GType assignment for the resource of UPnP type Returns :

 

@@ -189,7 +189,7 @@ otherwise.
 
void                gupnp_resource_factory_register_resource_proxy_type
                                                         (GUPnPResourceFactory *factory,
                                                          const char *upnp_type,
-                                                         GType type);

+                                                         GType type);
 

 Registers the GType type for the proxy of resource of UPnP type upnp_type.
 After this call, the factory factory will create object of GType type each
@@ -220,7 +220,7 @@ resource is a device or GUPNP_TYPE_SERVICE_PROXY if it
 

 

 
gupnp_resource_factory_unregister_resource_proxy_type ()

-
gboolean            gupnp_resource_factory_unregister_resource_proxy_type
+
gboolean            gupnp_resource_factory_unregister_resource_proxy_type
                                                         (GUPnPResourceFactory *factory,
                                                          const char *upnp_type);

 

@@ -241,7 +241,7 @@ Unregisters the GType assignment for the proxy of resource of UPnP type
 

diff --git a/doc/html/GUPnPRootDevice.html b/doc/html/GUPnPRootDevice.html
index e942da3..9d5c3eb 100644
--- a/doc/html/GUPnPRootDevice.html
+++ b/doc/html/GUPnPRootDevice.html
@@ -51,8 +51,8 @@
                                                          const char *description_path,
                                                          const char *description_dir);
 void                gupnp_root_device_set_available     (GUPnPRootDevice *root_device,
-                                                         gboolean available);
-gboolean            gupnp_root_device_get_available     (GUPnPRootDevice *root_device);
+                                                         gboolean available);
+gboolean            gupnp_root_device_get_available     (GUPnPRootDevice *root_device);
 const char *        gupnp_root_device_get_relative_location
                                                         (GUPnPRootDevice *root_device);
 const char *        gupnp_root_device_get_description_dir
@@ -64,7 +64,7 @@ const char *        
 
Object Hierarchy

 
-  GObject
+  GObject
    +----GUPnPDeviceInfo
          +----GUPnPDevice
                +----GUPnPRootDevice
@@ -73,10 +73,10 @@ const char *        
 
Properties

 
-  "available"                gboolean              : Read / Write
-  "description-dir"          gchar*                : Read / Write / Construct Only
+  "available"                gboolean              : Read / Write
+  "description-dir"          gchar*                : Read / Write / Construct Only
   "description-doc"          GUPnPXMLDoc*          : Write / Construct Only
-  "description-path"         gchar*                : Read / Write / Construct Only
+  "description-path"         gchar*                : Read / Write / Construct Only
 

 
 

@@ -140,7 +140,7 @@ be an absolute path or path relative to description_
 

 Create a new GUPnPRootDevice, automatically loading and parsing
 device description document from description_path if description_doc is
-NULL.
+NULL.
 

 

 

 
Returns :
A GList of strings. The
-elements should be g_free()'d and the list should be g_list_free()'d. [element-type utf8][transfer full]
+A GList of strings. The
+elements should be g_free()'d and the list should be g_list_free()'d. [element-type utf8][transfer full]
 
 

 
 
 
 

-TRUE if GType assignment was removed successfully, FALSE
+TRUE if GType assignment was removed successfully, FALSE
 otherwise.
 

 

 
Returns :

 
-TRUE if GType assignment was removed successfully, FALSE
+TRUE if GType assignment was removed successfully, FALSE
 otherwise.
 

 
@@ -157,7 +157,7 @@ device description document from description_path
 
-
@@ -180,7 +180,7 @@ be an absolute path or path relative to description_
 

 
gupnp_root_device_set_available ()

 
void                gupnp_root_device_set_available     (GUPnPRootDevice *root_device,
-                                                         gboolean available);

+                                                         gboolean available);
 

 Controls whether or not root_device is available (announcing
 its presence).
@@ -196,7 +196,7 @@ its presence).
 

+TRUE if root_device should be available
 

 


 
description_doc :
Device description document, or NULL
+Device description document, or NULL
 
 

 

 
available :

 
-TRUE if root_device should be available

 
 

@@ -204,7 +204,7 @@ its presence).
 

 

 
gupnp_root_device_get_available ()

-
gboolean            gupnp_root_device_get_available     (GUPnPRootDevice *root_device);

+
gboolean            gupnp_root_device_get_available     (GUPnPRootDevice *root_device);

 

 Get whether or not root_device is available (announcing its presence).
 

@@ -219,7 +219,7 @@ Get whether or not root_device is availa
 
 
Returns :

 
-TRUE if root_device is available, FALSE otherwise.
+TRUE if root_device is available, FALSE otherwise.
 
 
 

@@ -299,7 +299,7 @@ Get the path to the device description document of r
 
Property Details

 

 
The "available" property

-
  "available"                gboolean              : Read / Write

+
  "available"                gboolean              : Read / Write

 

 TRUE if this device is available.
 

@@ -308,7 +308,7 @@ TRUE if this device is available.
 

 

 
The "description-dir" property

-
  "description-dir"          gchar*                : Read / Write / Construct Only

+
  "description-dir"          gchar*                : Read / Write / Construct Only

 

 The path to directory where description documents are provided.
 

@@ -325,7 +325,7 @@ Device description document. Constructor property.
 

 

 
The "description-path" property

-
  "description-path"         gchar*                : Read / Write / Construct Only

+
  "description-path"         gchar*                : Read / Write / Construct Only

 

 The path to device description document. This could either be an
 absolute path or path relative to GUPnPRootDevice:description-dir.
diff --git a/doc/html/GUPnPService.html b/doc/html/GUPnPService.html
index 55b316d..349d967 100644
--- a/doc/html/GUPnPService.html
+++ b/doc/html/GUPnPService.html
@@ -46,36 +46,36 @@
 
struct              GUPnPService;
                     GUPnPServiceAction;
 const char *        gupnp_service_action_get_name       (GUPnPServiceAction *action);
-GList *             gupnp_service_action_get_locales    (GUPnPServiceAction *action);
+GList *             gupnp_service_action_get_locales    (GUPnPServiceAction *action);
 void                gupnp_service_action_get            (GUPnPServiceAction *action,
                                                          ...);
 void                gupnp_service_action_get_valist     (GUPnPServiceAction *action,
                                                          va_list var_args);
 void                gupnp_service_action_get_value      (GUPnPServiceAction *action,
                                                          const char *argument,
-                                                         GValue *value);
-GValue *            gupnp_service_action_get_gvalue     (GUPnPServiceAction *action,
+                                                         GValue *value);
+GValue *            gupnp_service_action_get_gvalue     (GUPnPServiceAction *action,
                                                          const char *argument,
-                                                         GType type);
-GList *             gupnp_service_action_get_values     (GUPnPServiceAction *action,
-                                                         GList *arg_names,
-                                                         GList *arg_types);
+                                                         GType type);
+GList *             gupnp_service_action_get_values     (GUPnPServiceAction *action,
+                                                         GList *arg_names,
+                                                         GList *arg_types);
 void                gupnp_service_action_set            (GUPnPServiceAction *action,
                                                          ...);
 void                gupnp_service_action_set_valist     (GUPnPServiceAction *action,
                                                          va_list var_args);
 void                gupnp_service_action_set_value      (GUPnPServiceAction *action,
                                                          const char *argument,
-                                                         const GValue *value);
+                                                         const GValue *value);
 void                gupnp_service_action_set_values     (GUPnPServiceAction *action,
-                                                         GList *arg_names,
-                                                         GList *arg_values);
+                                                         GList *arg_names,
+                                                         GList *arg_values);
 void                gupnp_service_action_return         (GUPnPServiceAction *action);
 void                gupnp_service_action_return_error   (GUPnPServiceAction *action,
-                                                         guint error_code,
+                                                         guint error_code,
                                                          const char *error_description);
 SoupMessage *       gupnp_service_action_get_message    (GUPnPServiceAction *action);
-guint               gupnp_service_action_get_argument_count
+guint               gupnp_service_action_get_argument_count
                                                         (GUPnPServiceAction *action);
 void                gupnp_service_notify                (GUPnPService *service,
                                                          ...);
@@ -83,18 +83,18 @@ const char *        va_list var_args);
 void                gupnp_service_notify_value          (GUPnPService *service,
                                                          const char *variable,
-                                                         const GValue *value);
+                                                         const GValue *value);
 void                gupnp_service_freeze_notify         (GUPnPService *service);
 void                gupnp_service_thaw_notify           (GUPnPService *service);
 void                gupnp_service_signals_autoconnect   (GUPnPService *service,
-                                                         gpointer user_data,
-                                                         GError **error);
+                                                         gpointer user_data,
+                                                         GError **error);
 

 

 

 
Object Hierarchy

 
-  GObject
+  GObject
    +----GUPnPServiceInfo
          +----GUPnPService
 

@@ -112,9 +112,9 @@ const char *        
 
Signals

 
-  "action-invoked"                                 : Has Details
-  "notify-failed"                                  : Run Last
-  "query-variable"                                 : Has Details
+  "action-invoked"                                 : Has Details
+  "notify-failed"                                  : Run Last
+  "query-variable"                                 : Has Details
 

 

 

@@ -168,9 +168,9 @@ Get the name of action.
 

 

 
gupnp_service_action_get_locales ()

-
GList *             gupnp_service_action_get_locales    (GUPnPServiceAction *action);

+
GList *             gupnp_service_action_get_locales    (GUPnPServiceAction *action);

 

-Get an ordered (preferred first) GList of locales preferred by
+Get an ordered (preferred first) GList of locales preferred by
 the client. Free list and elements after use.
 

 

@@ -183,7 +183,7 @@ the client. Free list and elements after use.
 
-
@@ -237,7 +237,7 @@ value location.
gupnp_service_action_get_value ()
void                gupnp_service_action_get_value      (GUPnPServiceAction *action,
                                                          const char *argument,
-                                                         GValue *value);

+                                                         GValue *value);

 Retrieves the value of argument into value.
 

@@ -255,8 +255,9 @@ Retrieves the value of argument into 
 
-
+

 

 
Returns :
A GList of char*
+A GList of char*
 locale names. [element-type utf8][transfer full]
 
 

 
 
 

 
value :
The GValue to store the value of the argument, initialized
-to the correct type.The GValue to store the value of the argument, initialized
+to the correct type. [inout]
+
 

 
 

@@ -264,9 +265,9 @@ to the correct type.
 

 

 
gupnp_service_action_get_gvalue ()

-
GValue *            gupnp_service_action_get_gvalue     (GUPnPServiceAction *action,
+
GValue *            gupnp_service_action_get_gvalue     (GUPnPServiceAction *action,
                                                          const char *argument,
-                                                         GType type);

+                                                         GType type);

 

 Retrieves the value of argument into a GValue of type type and returns it.
 The method exists only and only to satify PyGI, please use
@@ -290,8 +291,8 @@ The method exists only and only to satify PyGI, please use
 
 
 
Returns :

-Value as GValue associated with action.
-g_value_unset and g_slice_free it after usage.
+Value as GValue associated with action.
+g_value_unset and g_slice_free it after usage.
 Rename To: gupnp_service_action_get_value. [transfer full]
 
 
@@ -301,11 +302,11 @@ Rename To: gupnp_service_action_get_value. [
 

 
gupnp_service_action_get_values ()

-
GList *             gupnp_service_action_get_values     (GUPnPServiceAction *action,
-                                                         GList *arg_names,
-                                                         GList *arg_types);

+
GList *             gupnp_service_action_get_values     (GUPnPServiceAction *action,
+                                                         GList *arg_names,
+                                                         GList *arg_types);

 

-A variant of gupnp_service_action_get that uses GList instead of varargs.
+A variant of gupnp_service_action_get that uses GList instead of varargs.
 

 
@@ -317,17 +318,17 @@ A variant of 
 
-
+
-
-
@@ -381,7 +382,7 @@ actual return value.
 
gupnp_service_action_set_value ()
void                gupnp_service_action_set_value      (GUPnPServiceAction *action,
                                                          const char *argument,
-                                                         const GValue *value);

+                                                         const GValue *value);

 Sets the value of argument to value.
 

@@ -399,7 +400,7 @@ Sets the value of argument to 
 
-
+

 


 
arg_names :
(element-type utf8) : A GList of argument names as string(element-type utf8) : A GList of argument names as string
 

 

 
arg_types :
A GList of argument types as GType. [element-type GType]
+A GList of argument types as GType. [element-type GType]
 
 

 

 
Returns :
The values as GList of
-GValue. g_list_free the returned list and g_value_unset and g_slice_free
+The values as GList of
+GValue. g_list_free the returned list and g_value_unset and g_slice_free
 each element. [element-type GValue][transfer full]
 
 

 
 

 
value :
The GValue to store the return valueThe GValue to store the return value
 

 
 

@@ -408,8 +409,8 @@ Sets the value of argument to 
 
gupnp_service_action_set_values ()

 
void                gupnp_service_action_set_values     (GUPnPServiceAction *action,
-                                                         GList *arg_names,
-                                                         GList *arg_values);

+                                                         GList *arg_names,
+                                                         GList *arg_values);

Sets the specified action return values.

@@ -423,13 +424,13 @@ Sets the specified action return values.

arg_names :

-A GList of argument names. [element-type utf8][transfer none] +A GList of argument names. [element-type utf8][transfer none]

arg_values :

-The GList of values (as -GValues) that line up with arg_names. [element-type GValue][transfer none] +The GList of values (as +GValues) that line up with arg_names. [element-type GValue][transfer none] @@ -455,7 +456,7 @@ Return succesfully.

gupnp_service_action_return_error ()

void                gupnp_service_action_return_error   (GUPnPServiceAction *action,
-                                                         guint error_code,
+                                                         guint error_code,
                                                          const char *error_description);

Return error_code. @@ -474,7 +475,7 @@ Return error_code.

error_description :

-The error description, or NULL if error_code is +The error description, or NULL if error_code is one of GUPNP_CONTROL_ERROR_INVALID_ACTION, GUPNP_CONTROL_ERROR_INVALID_ARGS, GUPNP_CONTROL_ERROR_OUT_OF_SYNC or GUPNP_CONTROL_ERROR_ACTION_FAILED, in which case a description is @@ -512,7 +513,7 @@ after using it. [

gupnp_service_action_get_argument_count ()

-
guint               gupnp_service_action_get_argument_count
+
guint               gupnp_service_action_get_argument_count
                                                         (GUPnPServiceAction *action);

 

 Get the number of IN arguments from the action and return it.
@@ -570,7 +571,7 @@ use by language bindings.
 
 
var_args :

 A va_list of tuples of variable name, variable type, and variable
-value, terminated with NULL.
+value, terminated with NULL.
@@ -580,7 +581,7 @@ value, terminated with

gupnp_service_notify_value ()

void                gupnp_service_notify_value          (GUPnPService *service,
                                                          const char *variable,
-                                                         const GValue *value);
+ const GValue *value);

Notifies listening clients that variable has changed to value.

@@ -640,8 +641,8 @@ Sends out any pending notifications, and stops queuing of new ones.

gupnp_service_signals_autoconnect ()

void                gupnp_service_signals_autoconnect   (GUPnPService *service,
-                                                         gpointer user_data,
-                                                         GError **error);
+ gpointer user_data, + GError **error);

A convenience function that attempts to connect all possible "action-invoked" and "query-variable" signals to @@ -684,7 +685,7 @@ particular naming schemes described above.

error :

-return location for a GError, or NULL +return location for a GError, or NULL @@ -707,7 +708,7 @@ The containing

The "action-invoked" signal

void                user_function                      (GUPnPService       *service,
                                                         GUPnPServiceAction *action,
-                                                        gpointer            user_data)      : Has Details
+ gpointer user_data) : Has Details

Emitted whenever an action is invoked. Handler should process action and must call either gupnp_service_action_return() or @@ -736,9 +737,9 @@ Emitted whenever an action is invoked. Handler should process

The "notify-failed" signal

void                user_function                      (GUPnPService *service,
-                                                        gpointer      callback_url,
-                                                        gpointer      reason,
-                                                        gpointer      user_data)         : Run Last
+ gpointer callback_url, + gpointer reason, + gpointer user_data) : Run Last

Emitted whenever notification of a client fails.

@@ -751,11 +752,13 @@ Emitted whenever notification of a client fails.

callback_url :

-The callback URL +A GList of callback URLs. [type GList][element-type SoupURI] +

reason :

-A pointer to a GError describing why the notify failed +A pointer to a GError describing why the notify failed. [type GError] +

user_data :

@@ -768,9 +771,9 @@ Emitted whenever notification of a client fails.

The "query-variable" signal

void                user_function                      (GUPnPService *service,
-                                                        gchar        *variable,
-                                                        gpointer      value,
-                                                        gpointer      user_data)      : Has Details
+ gchar *variable, + gpointer value, + gpointer user_data) : Has Details

Emitted whenever service needs to know the value of variable. Handler should fill value with the value of variable. @@ -788,7 +791,8 @@ Handler should fill value with the value

value :

-The location of the GValue of the variable +The location of the GValue of the variable. [type GValue][inout] +

user_data :

diff --git a/doc/html/GUPnPServiceInfo.html b/doc/html/GUPnPServiceInfo.html index feca916..85c8074 100644 --- a/doc/html/GUPnPServiceInfo.html +++ b/doc/html/GUPnPServiceInfo.html @@ -45,8 +45,8 @@ void (*GUPnPServiceIntrospectionCallback) (GUPnPServiceInfo *info, GUPnPServiceIntrospection *introspection, - const GError *error, - gpointer user_data); + const GError *error, + gpointer user_data); GUPnPContext * gupnp_service_info_get_context (GUPnPServiceInfo *info); const char * gupnp_service_info_get_location (GUPnPServiceInfo *info); const SoupURI * gupnp_service_info_get_url_base (GUPnPServiceInfo *info); @@ -59,17 +59,17 @@ const char * GUPnPServiceInfo *info); GUPnPServiceIntrospection * gupnp_service_info_get_introspection (GUPnPServiceInfo *info, - GError **error); + GError **error); void gupnp_service_info_get_introspection_async (GUPnPServiceInfo *info, GUPnPServiceIntrospectionCallback callback, - gpointer user_data); + gpointer user_data);

Object Hierarchy

-  GObject
+  GObject
    +----GUPnPServiceInfo
          +----GUPnPService
          +----GUPnPServiceProxy
@@ -80,11 +80,11 @@ const char *        
   "context"                  GUPnPContext*         : Read / Write / Construct Only
   "document"                 GUPnPXMLDoc*          : Write / Construct Only
-  "element"                  gpointer              : Write / Construct Only
-  "location"                 gchar*                : Read / Write / Construct Only
-  "service-type"             gchar*                : Read / Write / Construct Only
-  "udn"                      gchar*                : Read / Write / Construct Only
-  "url-base"                 gpointer              : Read / Write / Construct Only
+  "element"                  gpointer              : Write / Construct Only
+  "location"                 gchar*                : Read / Write / Construct Only
+  "service-type"             gchar*                : Read / Write / Construct Only
+  "udn"                      gchar*                : Read / Write / Construct Only
+  "url-base"                 SoupURI*              : Read / Write / Construct Only
@@ -110,8 +110,8 @@ functions below. 
void                (*GUPnPServiceIntrospectionCallback)
                                                         (GUPnPServiceInfo *info,
                                                          GUPnPServiceIntrospection *introspection,
-                                                         const GError *error,
-                                                         gpointer user_data);
+ const GError *error, + gpointer user_data);

Callback notifying that introspection for info has been obtained.

@@ -128,7 +128,7 @@ Callback notifying that introspection fo

error :

-The GError that occurred, or NULL +The GError that occurred, or NULL

user_data :

@@ -231,7 +231,7 @@ Get the Unique Device Name of the containing device.

gupnp_service_info_get_service_type ()

const char *        gupnp_service_info_get_service_type (GUPnPServiceInfo *info);

-Get the UPnP service type, or NULL. +Get the UPnP service type, or NULL.

@@ -253,7 +253,7 @@ Get the UPnP service type, or

gupnp_service_info_get_id ()

char *              gupnp_service_info_get_id           (GUPnPServiceInfo *info);

-Get the ID of this service, or NULL if there is no ID. +Get the ID of this service, or NULL if there is no ID.

@@ -265,7 +265,7 @@ Get the ID of this service, or Returns :

- +
A string. This string should be freed with g_free() after use.A string. This string should be freed with g_free() after use.
@@ -275,7 +275,7 @@ Get the ID of this service, or

gupnp_service_info_get_scpd_url ()

char *              gupnp_service_info_get_scpd_url     (GUPnPServiceInfo *info);

-Get the SCPD URL for this service, or NULL if there is no SCPD. +Get the SCPD URL for this service, or NULL if there is no SCPD.

@@ -287,7 +287,7 @@ Get the SCPD URL for this service, or Returns :

- +
A string. This string should be freed with g_free() after use.A string. This string should be freed with g_free() after use.
@@ -297,7 +297,7 @@ Get the SCPD URL for this service, or

gupnp_service_info_get_control_url ()

char *              gupnp_service_info_get_control_url  (GUPnPServiceInfo *info);

-Get the control URL for this service, or NULL.. +Get the control URL for this service, or NULL..

@@ -309,7 +309,7 @@ Get the control URL for this service, or Returns :

- +
A string. This string should be freed with g_free() after use.A string. This string should be freed with g_free() after use.
@@ -320,7 +320,7 @@ Get the control URL for this service, or char * gupnp_service_info_get_event_subscription_url (GUPnPServiceInfo *info);

-Get the event subscription URL for this service, or NULL. +Get the event subscription URL for this service, or NULL.

@@ -332,7 +332,7 @@ Get the event subscription URL for this service, or Returns :

- +
A string. This string should be freed with g_free() after use.A string. This string should be freed with g_free() after use.
@@ -342,7 +342,7 @@ Get the event subscription URL for this service, or

gupnp_service_info_get_introspection ()

GUPnPServiceIntrospection * gupnp_service_info_get_introspection
                                                         (GUPnPServiceInfo *info,
-                                                         GError **error);
+ GError **error);

Note that introspection object is created from the information in service description document (SCPD) provided by the service so it can not be created @@ -362,13 +362,13 @@ instead, this function re-enter the GMainloop before returning.

error :

-return location for a GError, or NULL +return location for a GError, or NULL

Returns :

A new GUPnPServiceIntrospection for this -service or NULL. Unref after use. [transfer full] +service or NULL. Unref after use. [transfer full] @@ -380,7 +380,7 @@ service or void gupnp_service_info_get_introspection_async (GUPnPServiceInfo *info, GUPnPServiceIntrospectionCallback callback, - gpointer user_data); + gpointer user_data);

Note that introspection object is created from the information in service description document (SCPD) provided by the service so it can not be created @@ -427,7 +427,7 @@ Private property.

The "element" property

-
  "element"                  gpointer              : Write / Construct Only
+
  "element"                  gpointer              : Write / Construct Only

Private property.

@@ -436,7 +436,7 @@ Private property.

The "location" property

-
  "location"                 gchar*                : Read / Write / Construct Only
+
  "location"                 gchar*                : Read / Write / Construct Only

The location of the device description file.

@@ -445,7 +445,7 @@ The location of the device description file.

The "service-type" property

-
  "service-type"             gchar*                : Read / Write / Construct Only
+
  "service-type"             gchar*                : Read / Write / Construct Only

The service type.

@@ -454,7 +454,7 @@ The service type.

The "udn" property

-
  "udn"                      gchar*                : Read / Write / Construct Only
+
  "udn"                      gchar*                : Read / Write / Construct Only

The UDN of the containing device.

@@ -463,7 +463,7 @@ The UDN of the containing device.

The "url-base" property

-
  "url-base"                 gpointer              : Read / Write / Construct Only
+
  "url-base"                 SoupURI*              : Read / Write / Construct Only

The URL base (SoupURI).

diff --git a/doc/html/GUPnPServiceProxy.html b/doc/html/GUPnPServiceProxy.html index d7ba355..c2e9860 100644 --- a/doc/html/GUPnPServiceProxy.html +++ b/doc/html/GUPnPServiceProxy.html @@ -47,99 +47,99 @@ GUPnPServiceProxyAction; void (*GUPnPServiceProxyActionCallback) (GUPnPServiceProxy *proxy, GUPnPServiceProxyAction *action, - gpointer user_data); + gpointer user_data); void (*GUPnPServiceProxyNotifyCallback) (GUPnPServiceProxy *proxy, const char *variable, - GValue *value, - gpointer user_data); -gboolean gupnp_service_proxy_send_action (GUPnPServiceProxy *proxy, + GValue *value, + gpointer user_data); +gboolean gupnp_service_proxy_send_action (GUPnPServiceProxy *proxy, const char *action, - GError **error, + GError **error, ...); -gboolean gupnp_service_proxy_send_action_valist +gboolean gupnp_service_proxy_send_action_valist (GUPnPServiceProxy *proxy, const char *action, - GError **error, + GError **error, va_list var_args); -gboolean gupnp_service_proxy_send_action_hash +gboolean gupnp_service_proxy_send_action_hash (GUPnPServiceProxy *proxy, const char *action, - GError **error, - GHashTable *in_hash, - GHashTable *out_hash); -gboolean gupnp_service_proxy_send_action_list + GError **error, + GHashTable *in_hash, + GHashTable *out_hash); +gboolean gupnp_service_proxy_send_action_list (GUPnPServiceProxy *proxy, const char *action, - GError **error, - GList *in_names, - GList *in_values, - GList *out_names, - GList *out_types, - GList **out_values); + GError **error, + GList *in_names, + GList *in_values, + GList *out_names, + GList *out_types, + GList **out_values); GUPnPServiceProxyAction * gupnp_service_proxy_begin_action (GUPnPServiceProxy *proxy, const char *action, GUPnPServiceProxyActionCallback callback, - gpointer user_data, + gpointer user_data, ...); GUPnPServiceProxyAction * gupnp_service_proxy_begin_action_valist (GUPnPServiceProxy *proxy, const char *action, GUPnPServiceProxyActionCallback callback, - gpointer user_data, + gpointer user_data, va_list var_args); GUPnPServiceProxyAction * gupnp_service_proxy_begin_action_hash (GUPnPServiceProxy *proxy, const char *action, GUPnPServiceProxyActionCallback callback, - gpointer user_data, - GHashTable *hash); + gpointer user_data, + GHashTable *hash); GUPnPServiceProxyAction * gupnp_service_proxy_begin_action_list (GUPnPServiceProxy *proxy, const char *action, - GList *in_names, - GList *in_values, + GList *in_names, + GList *in_values, GUPnPServiceProxyActionCallback callback, - gpointer user_data); -gboolean gupnp_service_proxy_end_action (GUPnPServiceProxy *proxy, + gpointer user_data); +gboolean gupnp_service_proxy_end_action (GUPnPServiceProxy *proxy, GUPnPServiceProxyAction *action, - GError **error, + GError **error, ...); -gboolean gupnp_service_proxy_end_action_valist +gboolean gupnp_service_proxy_end_action_valist (GUPnPServiceProxy *proxy, GUPnPServiceProxyAction *action, - GError **error, + GError **error, va_list var_args); -gboolean gupnp_service_proxy_end_action_hash (GUPnPServiceProxy *proxy, +gboolean gupnp_service_proxy_end_action_hash (GUPnPServiceProxy *proxy, GUPnPServiceProxyAction *action, - GError **error, - GHashTable *hash); -gboolean gupnp_service_proxy_end_action_list (GUPnPServiceProxy *proxy, + GError **error, + GHashTable *hash); +gboolean gupnp_service_proxy_end_action_list (GUPnPServiceProxy *proxy, GUPnPServiceProxyAction *action, - GError **error, - GList *out_names, - GList *out_types, - GList **out_values); + GError **error, + GList *out_names, + GList *out_types, + GList **out_values); void gupnp_service_proxy_cancel_action (GUPnPServiceProxy *proxy, GUPnPServiceProxyAction *action); -gboolean gupnp_service_proxy_add_notify (GUPnPServiceProxy *proxy, +gboolean gupnp_service_proxy_add_notify (GUPnPServiceProxy *proxy, const char *variable, - GType type, + GType type, GUPnPServiceProxyNotifyCallback callback, - gpointer user_data); -gboolean gupnp_service_proxy_remove_notify (GUPnPServiceProxy *proxy, + gpointer user_data); +gboolean gupnp_service_proxy_remove_notify (GUPnPServiceProxy *proxy, const char *variable, GUPnPServiceProxyNotifyCallback callback, - gpointer user_data); + gpointer user_data); void gupnp_service_proxy_set_subscribed (GUPnPServiceProxy *proxy, - gboolean subscribed); -gboolean gupnp_service_proxy_get_subscribed (GUPnPServiceProxy *proxy); + gboolean subscribed); +gboolean gupnp_service_proxy_get_subscribed (GUPnPServiceProxy *proxy);

Object Hierarchy

-  GObject
+  GObject
    +----GUPnPServiceInfo
          +----GUPnPServiceProxy
@@ -147,13 +147,13 @@

Properties

-  "subscribed"               gboolean              : Read / Write
+  "subscribed"               gboolean              : Read / Write

Signals

-  "subscription-lost"                              : Run Last
+  "subscription-lost"                              : Run Last
@@ -187,7 +187,7 @@ Opaque structure for holding in-progress action data.

GUPnPServiceProxyActionCallback ()

void                (*GUPnPServiceProxyActionCallback)  (GUPnPServiceProxy *proxy,
                                                          GUPnPServiceProxyAction *action,
-                                                         gpointer user_data);
+ gpointer user_data);

Callback notifying that action on proxy has returned and gupnp_service_proxy_end_action() etc can be called. @@ -215,8 +215,8 @@ Callback notifying that action on

GUPnPServiceProxyNotifyCallback ()

void                (*GUPnPServiceProxyNotifyCallback)  (GUPnPServiceProxy *proxy,
                                                          const char *variable,
-                                                         GValue *value,
-                                                         gpointer user_data);
+ GValue *value, + gpointer user_data);

Callback notifying that the state variable variable on proxy has changed to value. @@ -234,7 +234,7 @@ Callback notifying that the state variable variable<

value :

-The GValue of the variable being notified +The GValue of the variable being notified

user_data :

@@ -246,9 +246,9 @@ Callback notifying that the state variable variable<

gupnp_service_proxy_send_action ()

-
gboolean            gupnp_service_proxy_send_action     (GUPnPServiceProxy *proxy,
+
gboolean            gupnp_service_proxy_send_action     (GUPnPServiceProxy *proxy,
                                                          const char *action,
-                                                         GError **error,
+                                                         GError **error,
                                                          ...);

 

 Sends action action with parameters Varargs to the service exposed by
@@ -269,13 +269,13 @@ a UPnPError the error code will be the same in error
 
 
 
error :

-The location where to store any error, or NULL
+The location where to store any error, or NULL
 
 
 
 
Returns :

 
-TRUE if sending the action was succesful.
+TRUE if sending the action was succesful.
@@ -283,10 +283,10 @@ a UPnPError the error code will be the same in error

gupnp_service_proxy_send_action_valist ()

-
gboolean            gupnp_service_proxy_send_action_valist
+
gboolean            gupnp_service_proxy_send_action_valist
                                                         (GUPnPServiceProxy *proxy,
                                                          const char *action,
-                                                         GError **error,
+                                                         GError **error,
                                                          va_list var_args);

 

 See gupnp_service_proxy_send_action(); this version takes a va_list for
@@ -306,19 +306,19 @@ use by language bindings.
 
 
 
error :

-The location where to store any error, or NULL
+The location where to store any error, or NULL
 
 
 
 
var_args :

 va_list of tuples of in parameter name, in parameter type, and in
-parameter value, followed by NULL, and then tuples of out parameter name,
+parameter value, followed by NULL, and then tuples of out parameter name,
 out parameter type, and out parameter value location
 
 
 
Returns :

 
-TRUE if sending the action was succesful.
+TRUE if sending the action was succesful.
@@ -326,15 +326,15 @@ out parameter type, and out parameter value location

gupnp_service_proxy_send_action_hash ()

-
gboolean            gupnp_service_proxy_send_action_hash
+
gboolean            gupnp_service_proxy_send_action_hash
                                                         (GUPnPServiceProxy *proxy,
                                                          const char *action,
-                                                         GError **error,
-                                                         GHashTable *in_hash,
-                                                         GHashTable *out_hash);

+                                                         GError **error,
+                                                         GHashTable *in_hash,
+                                                         GHashTable *out_hash);

See gupnp_service_proxy_send_action(); this version takes a pair of -GHashTables for runtime determined parameter lists. +GHashTables for runtime determined parameter lists.

@@ -350,25 +350,25 @@ See error :

- - - +TRUE if sending the action was succesful.
The location where to store any error, or NULL +The location where to store any error, or NULL

in_hash :

A GHashTable of in -parameter name and GValue pairs. [element-type utf8 GValue][transfer none] +A GHashTable of in +parameter name and GValue pairs. [element-type utf8 GValue][transfer none]

out_hash :

A GHashTable -of out parameter name and initialized GValue pairs. [inout][element-type utf8 GValue][transfer full] +A GHashTable +of out parameter name and initialized GValue pairs. [inout][element-type utf8 GValue][transfer full]

Returns :

 -TRUE if sending the action was succesful.
@@ -376,15 +376,15 @@ of out parameter name and initialized

gupnp_service_proxy_send_action_list ()

-
gboolean            gupnp_service_proxy_send_action_list
+
gboolean            gupnp_service_proxy_send_action_list
                                                         (GUPnPServiceProxy *proxy,
                                                          const char *action,
-                                                         GError **error,
-                                                         GList *in_names,
-                                                         GList *in_values,
-                                                         GList *out_names,
-                                                         GList *out_types,
-                                                         GList **out_values);

+                                                         GError **error,
+                                                         GList *in_names,
+                                                         GList *in_values,
+                                                         GList *out_names,
+                                                         GList *out_types,
+                                                         GList **out_values);

The synchronous variant of gupnp_service_proxy_begin_action_list and gupnp_service_proxy_end_action_list. @@ -403,48 +403,48 @@ The synchronous variant of error :

-The location where to store any error, or NULL +The location where to store any error, or NULL

in_names :

-GList of 'in' parameter +GList of 'in' parameter names (as strings). [element-type utf8][transfer none]

in_values :

-GList of values (as -GValue) that line up with in_names. [element-type GValue][transfer none] +GList of values (as +GValue) that line up with in_names. [element-type GValue][transfer none]

out_names :

-GList of 'out' parameter +GList of 'out' parameter names (as strings). [element-type utf8][transfer none]

out_types :

-GList of types (as GType) +GList of types (as GType) that line up with out_names. [element-type GType][transfer none]

out_values :

-GList of values -(as GValue) that line up with out_names and out_types. [element-type GValue][transfer full][out] +GList of values +(as GValue) that line up with out_names and out_types. [element-type GValue][transfer full][out]

Returns :

-TRUE if sending the action was succesful. +TRUE if sending the action was succesful.
@@ -456,7 +456,7 @@ that line up with out_names. GUPnPServiceProxy *proxy, const char *action, GUPnPServiceProxyActionCallback callback, - gpointer user_data, + gpointer user_data, ...);

Sends action action with parameters Varargs to the service exposed by @@ -504,7 +504,7 @@ or failed. [GUPnPServiceProxy *proxy, const char *action, GUPnPServiceProxyActionCallback callback, - gpointer user_data, + gpointer user_data, va_list var_args);

See gupnp_service_proxy_begin_action(); this version takes a va_list for @@ -554,10 +554,10 @@ be freed when calling GUPnPServiceProxy *proxy, const char *action, GUPnPServiceProxyActionCallback callback, - gpointer user_data, - GHashTable *hash); + gpointer user_data, + GHashTable *hash);

-See gupnp_service_proxy_begin_action(); this version takes a GHashTable +See gupnp_service_proxy_begin_action(); this version takes a GHashTable for runtime generated parameter lists.

@@ -585,7 +585,8 @@ or failed. [hash :

- + @@ -603,10 +604,10 @@ be freed when calling GUPnPServiceProxyAction * gupnp_service_proxy_begin_action_list (GUPnPServiceProxy *proxy, const char *action, - GList *in_names, - GList *in_values, + GList *in_names, + GList *in_values, GUPnPServiceProxyActionCallback callback, - gpointer user_data); + gpointer user_data);

A variant of gupnp_service_proxy_begin_action that takes lists of in-parameter names, types and values. @@ -626,15 +627,15 @@ in-parameter names, types and values.

@@ -660,9 +661,9 @@ be freed when calling

gupnp_service_proxy_end_action ()

-
gboolean            gupnp_service_proxy_end_action      (GUPnPServiceProxy *proxy,
+
gboolean            gupnp_service_proxy_end_action      (GUPnPServiceProxy *proxy,
                                                          GUPnPServiceProxyAction *action,
-                                                         GError **error,
+                                                         GError **error,
                                                          ...);

 

 Retrieves the result of action. The out parameters in Varargs will be
@@ -683,13 +684,13 @@ a UPnPError the error code will be the same in error
- +TRUE on success.
A GHashTable of in parameter name and GValue pairsA GHashTable of in parameter name and GValue pairs. [element-type utf8 GValue] +

Returns :

in_names :

 -GList of 'in' parameter +GList of 'in' parameter names (as strings). [element-type utf8][transfer none]

in_values :

 -GList of values (as -GValue) that line up with in_names. [element-type GValue][transfer none] +GList of values (as +GValue) that line up with in_names. [element-type GValue][transfer none]

error :

The location where to store any error, or NULL +The location where to store any error, or NULL

Returns :

 -TRUE on success.
@@ -697,10 +698,10 @@ a UPnPError the error code will be the same in error

gupnp_service_proxy_end_action_valist ()

-
gboolean            gupnp_service_proxy_end_action_valist
+
gboolean            gupnp_service_proxy_end_action_valist
                                                         (GUPnPServiceProxy *proxy,
                                                          GUPnPServiceProxyAction *action,
-                                                         GError **error,
+                                                         GError **error,
                                                          va_list var_args);

 

 See gupnp_service_proxy_end_action(); this version takes a va_list for
@@ -720,7 +721,7 @@ use by language bindings.
 
 
 
error :

-The location where to store any error, or NULL
+The location where to store any error, or NULL
 
 
 
@@ -732,7 +733,7 @@ freed after use
 
 
Returns :

 
-TRUE on success.
+TRUE on success.
@@ -740,12 +741,12 @@ freed after use

gupnp_service_proxy_end_action_hash ()

-
gboolean            gupnp_service_proxy_end_action_hash (GUPnPServiceProxy *proxy,
+
gboolean            gupnp_service_proxy_end_action_hash (GUPnPServiceProxy *proxy,
                                                          GUPnPServiceProxyAction *action,
-                                                         GError **error,
-                                                         GHashTable *hash);

+                                                         GError **error,
+                                                         GHashTable *hash);

-See gupnp_service_proxy_end_action(); this version takes a GHashTable for +See gupnp_service_proxy_end_action(); this version takes a GHashTable for runtime generated parameter lists.

@@ -762,19 +763,19 @@ runtime generated parameter lists. - - +TRUE on success.

error :

The location where to store any error, or NULL +The location where to store any error, or NULL

hash :

A GHashTable of -out parameter name and initialised GValue pairs. [element-type utf8 GValue][inout][transfer none] +A GHashTable of +out parameter name and initialised GValue pairs. [element-type utf8 GValue][inout][transfer none]

Returns :

 -TRUE on success.
@@ -782,20 +783,20 @@ out parameter name and initialised

gupnp_service_proxy_end_action_list ()

-
gboolean            gupnp_service_proxy_end_action_list (GUPnPServiceProxy *proxy,
+
gboolean            gupnp_service_proxy_end_action_list (GUPnPServiceProxy *proxy,
                                                          GUPnPServiceProxyAction *action,
-                                                         GError **error,
-                                                         GList *out_names,
-                                                         GList *out_types,
-                                                         GList **out_values);

+                                                         GError **error,
+                                                         GList *out_names,
+                                                         GList *out_types,
+                                                         GList **out_values);

A variant of gupnp_service_proxy_end_action that takes lists of out-parameter names, types and place-holders for values. The returned list -in out_values must be freed using g_list_free and each element in it using -g_value_unset and g_slice_free. +in out_values must be freed using g_list_free and each element in it using +g_value_unset and g_slice_free.

-Return value : TRUE on success. +Return value : TRUE on success.

@@ -811,28 +812,28 @@ Return value : error :

- @@ -864,11 +865,11 @@ Cancels action, freeing the

gupnp_service_proxy_add_notify ()

-
gboolean            gupnp_service_proxy_add_notify      (GUPnPServiceProxy *proxy,
+
gboolean            gupnp_service_proxy_add_notify      (GUPnPServiceProxy *proxy,
                                                          const char *variable,
-                                                         GType type,
+                                                         GType type,
                                                          GUPnPServiceProxyNotifyCallback callback,
-                                                         gpointer user_data);

+                                                         gpointer user_data);

Sets up callback to be called whenever a change notification for variable is recieved. @@ -902,7 +903,7 @@ Sets up callback to be called whenever a

+TRUE on success.
The location where to store any error, or NULL +The location where to store any error, or NULL

out_names :

 -GList of 'out' parameter +GList of 'out' parameter names (as strings). [element-type utf8][transfer none]

out_types :

 -GList of types (as GType) +GList of types (as GType) that line up with out_names. [element-type GType][transfer none]

out_values :

 -GList of values -(as GValue) that line up with out_names and out_types. [element-type GValue][transfer full][out] +GList of values +(as GValue) that line up with out_names and out_types. [element-type GValue][transfer full][out]

Returns :

 -TRUE on success.
@@ -910,10 +911,10 @@ Sets up callback to be called whenever a

gupnp_service_proxy_remove_notify ()

-
gboolean            gupnp_service_proxy_remove_notify   (GUPnPServiceProxy *proxy,
+
gboolean            gupnp_service_proxy_remove_notify   (GUPnPServiceProxy *proxy,
                                                          const char *variable,
                                                          GUPnPServiceProxyNotifyCallback callback,
-                                                         gpointer user_data);

+                                                         gpointer user_data);

Cancels the variable change notification for callback and user_data.

@@ -942,7 +943,7 @@ Cancels the variable change notification for callbac

Returns :

-TRUE on success. +TRUE on success.
@@ -951,7 +952,7 @@ Cancels the variable change notification for callbac

gupnp_service_proxy_set_subscribed ()

void                gupnp_service_proxy_set_subscribed  (GUPnPServiceProxy *proxy,
-                                                         gboolean subscribed);
+ gboolean subscribed);

(Un)subscribes to this service.

@@ -972,7 +973,7 @@ destruction instead.

subscribed :

-TRUE to subscribe to this service +TRUE to subscribe to this service
@@ -980,7 +981,7 @@ destruction instead.

gupnp_service_proxy_get_subscribed ()

-
gboolean            gupnp_service_proxy_get_subscribed  (GUPnPServiceProxy *proxy);
+
gboolean            gupnp_service_proxy_get_subscribed  (GUPnPServiceProxy *proxy);

Returns if we are subscribed to this service.

@@ -995,7 +996,7 @@ Returns if we are subscribed to this service.

Returns :

-TRUE if we are subscribed to this service, otherwise FALSE. +TRUE if we are subscribed to this service, otherwise FALSE.
@@ -1005,7 +1006,7 @@ Returns if we are subscribed to this service.

Property Details

The "subscribed" property

-
  "subscribed"               gboolean              : Read / Write
+
  "subscribed"               gboolean              : Read / Write

Whether we are subscribed to this service.

@@ -1017,8 +1018,8 @@ Whether we are subscribed to this service.

The "subscription-lost" signal

void                user_function                      (GUPnPServiceProxy *proxy,
-                                                        gpointer           error,
-                                                        gpointer           user_data)      : Run Last
+ gpointer error, + gpointer user_data) : Run Last

Emitted whenever the subscription to this service has been lost due to an error condition. @@ -1032,8 +1033,9 @@ to an error condition.

error :

-A pointer to a GError describing why the subscription has -been lost +A pointer to a GError describing why the subscription has +been lost. [type GError] +

user_data :

diff --git a/doc/html/GUPnPXMLDoc.html b/doc/html/GUPnPXMLDoc.html index 2e4ae2a..38b9a11 100644 --- a/doc/html/GUPnPXMLDoc.html +++ b/doc/html/GUPnPXMLDoc.html @@ -42,13 +42,13 @@ 
struct              GUPnPXMLDoc;
 GUPnPXMLDoc *       gupnp_xml_doc_new                   (xmlDoc *xml_doc);
 GUPnPXMLDoc *       gupnp_xml_doc_new_from_path         (const char *path,
-                                                         GError **error);
+                                                         GError **error);

Object Hierarchy

-  GObject
+  GObject
    +----GUPnPXMLDoc
@@ -86,7 +86,7 @@ Create a new

Returns :

-A new GUPnPXMLDoc, or NULL on an error +A new GUPnPXMLDoc, or NULL on an error
@@ -95,7 +95,7 @@ Create a new

gupnp_xml_doc_new_from_path ()

GUPnPXMLDoc *       gupnp_xml_doc_new_from_path         (const char *path,
-                                                         GError **error);
+ GError **error);

Create a new GUPnPXMLDoc for the XML document at path.

@@ -112,7 +112,7 @@ Create a new

Returns :

-A new GUPnPXMLDoc, or NULL on an error +A new GUPnPXMLDoc, or NULL on an error
diff --git a/doc/html/annotation-glossary.html b/doc/html/annotation-glossary.html index f2b328c..e128a1a 100644 --- a/doc/html/annotation-glossary.html +++ b/doc/html/annotation-glossary.html @@ -33,9 +33,9 @@  |  E  |  - T -  |  S +  |  + T
@@ -65,14 +65,17 @@
element-type

Generics and defining elements of containers and arrays.

+

S

+
+scope call
+

The callback is valid only during the call to the method.

T

transfer full

Free data after the code is done.

-

S

-scope call
-

The callback is valid only during the call to the method.

+type +

Override the parsed C type with given type

diff --git a/doc/html/client-tutorial.html b/doc/html/client-tutorial.html index 1aa265a..7f635e0 100644 --- a/doc/html/client-tutorial.html +++ b/doc/html/client-tutorial.html @@ -24,7 +24,7 @@ Writing a UPnP Client

-Introduction

+Introduction

This chapter explains how to write an application which fetches the external IP address from an UPnP-compliant modem. To do this a @@ -41,7 +41,7 @@

-Finding Services

+Finding Services

First, we initialize GUPnP and create a control point targeting the service type. Then we connect a signal handler so that we are notified @@ -102,7 +102,7 @@ main (int argc, char **argv)

-Invoking Actions

+Invoking Actions

Now we have an application which searches for the service we specified and calls service_proxy_available_cb for each one it @@ -152,7 +152,7 @@ service_proxy_available_cb (GUPnPControlPoint *cp,

-Subscribing to state variable change notifications

+Subscribing to state variable change notifications

It is possible to get change notifications for the service state variables that have attribute sendEvents="yes". We'll demonstrate @@ -187,7 +187,7 @@ service_proxy_available_cb (GUPnPControlPoint *cp,

-Generating Wrappers

+Generating Wrappers

Using gupnp_service_proxy_send_action() and gupnp_service_proxy_add_notify () can become tedious, because of the requirement to specify the types and deal diff --git a/doc/html/gupnp-Error-codes.html b/doc/html/gupnp-Error-codes.html index 305f420..a565d32 100644 --- a/doc/html/gupnp-Error-codes.html +++ b/doc/html/gupnp-Error-codes.html @@ -57,13 +57,13 @@ enum #define GUPNP_SERVER_ERROR (gupnp_server_error_quark ())

-The GQuark uniquely used by GUPnP's server errors. +The GQuark uniquely used by GUPnP's server errors.

- +

Returns :

a GQuark uniquely used by GUPnP's server errors.a GQuark uniquely used by GUPnP's server errors.
@@ -80,7 +80,7 @@ The GError codes used for errors in the GUPNP_SERVER_ERROR domain, when there +GError codes used for errors in the GUPNP_SERVER_ERROR domain, when there is communication with another server.

@@ -125,13 +125,13 @@ is communication with another server. 
#define GUPNP_EVENTING_ERROR (gupnp_eventing_error_quark ())

-The GQuark uniquely used by GUPnP's eventing errors. +The GQuark uniquely used by GUPnP's eventing errors.

- +

Returns :

a GQuark uniquely used by GUPnP's eventing errors.a GQuark uniquely used by GUPnP's eventing errors.
@@ -145,7 +145,7 @@ The GError codes used for errors in the GUPNP_EVENTING_ERROR domain, during +GError codes used for errors in the GUPNP_EVENTING_ERROR domain, during eventing of state variables.

@@ -175,13 +175,13 @@ eventing of state variables. 
#define GUPNP_CONTROL_ERROR (gupnp_control_error_quark ())

-The GQuark uniquely used by GUPnP's control errors. +The GQuark uniquely used by GUPnP's control errors.

- +

Returns :

a GQuark uniquely used by GUPnP's control errors.a GQuark uniquely used by GUPnP's control errors.
@@ -196,7 +196,7 @@ The GError codes used for errors in the GUPNP_CONTROL_ERROR domain, during +GError codes used for errors in the GUPNP_CONTROL_ERROR domain, during invocation of service actions.

@@ -231,13 +231,13 @@ invocation of service actions. 
#define GUPNP_XML_ERROR (gupnp_xml_error_quark ())

-The GQuark uniquely used by GUPnP XML processing errors. +The GQuark uniquely used by GUPnP XML processing errors.

- +

Returns :

a GQuark uniquely used by GUPnP XML processing errors.a GQuark uniquely used by GUPnP XML processing errors.
@@ -253,7 +253,7 @@ The GError codes used for errors in the GUPNP_XML_ERROR domain, during +GError codes used for errors in the GUPNP_XML_ERROR domain, during processing of XML data.

diff --git a/doc/html/gupnp-binding-tool.html b/doc/html/gupnp-binding-tool.html index 640a753..8ec03f5 100644 --- a/doc/html/gupnp-binding-tool.html +++ b/doc/html/gupnp-binding-tool.html @@ -33,7 +33,7 @@

gupnp-binding-tool [--prefix {PREFIX}] [--mode {client|server}] {SCPD file}

-

Description

+

Description

gupnp-binding-tool takes a SCPD file and generates convenience C functions which call the actual GUPnP functions. The client-side bindings can be seen @@ -49,7 +49,7 @@

-

Client side bindings

+

Client side bindings

As an example, this action:

@@ -138,7 +138,7 @@ igd_external_ip_address_add_notify (GUPnPServiceProxy *proxy,

-

Server side bindings

+

Server side bindings

The corresponding server bindings for the same UPnP action (DeletePortMapping) look like this: diff --git a/doc/html/gupnp-gupnp-service-introspection.html b/doc/html/gupnp-gupnp-service-introspection.html index ab704fa..f791ba3 100644 --- a/doc/html/gupnp-gupnp-service-introspection.html +++ b/doc/html/gupnp-gupnp-service-introspection.html @@ -46,33 +46,33 @@ GUPnPServiceActionInfo; GUPnPServiceStateVariableInfo; struct GUPnPServiceIntrospection; -const GList * gupnp_service_introspection_list_action_names +const GList * gupnp_service_introspection_list_action_names (GUPnPServiceIntrospection *introspection); -const GList * gupnp_service_introspection_list_actions +const GList * gupnp_service_introspection_list_actions (GUPnPServiceIntrospection *introspection); const GUPnPServiceActionInfo * gupnp_service_introspection_get_action (GUPnPServiceIntrospection *introspection, - const gchar *action_name); -const GList * gupnp_service_introspection_list_state_variable_names + const gchar *action_name); +const GList * gupnp_service_introspection_list_state_variable_names (GUPnPServiceIntrospection *introspection); -const GList * gupnp_service_introspection_list_state_variables +const GList * gupnp_service_introspection_list_state_variables (GUPnPServiceIntrospection *introspection); const GUPnPServiceStateVariableInfo * gupnp_service_introspection_get_state_variable (GUPnPServiceIntrospection *introspection, - const gchar *variable_name); + const gchar *variable_name);

Object Hierarchy

-  GObject
+  GObject
    +----GUPnPServiceIntrospection

Properties

-  "scpd"                     gpointer              : Write / Construct Only
+  "scpd"                     gpointer              : Write / Construct Only
@@ -155,7 +155,7 @@ This structure contains information about the argument of service action. argument.
- + @@ -180,9 +180,10 @@ This structure contains information about a service action. - + +(of type GUPnPServiceActionArgInfo) of this action. [type GList][element-type GUPnP.ServiceActionArgInfo] +

gboolean retval;

gboolean retval;

 Whether this argument is the return value of the action.
The name of the action argument.

GList *arguments;

GList *arguments;

 A GList of all the arguments -(of type GUPnPServiceActionArgInfo) of this action.
@@ -213,42 +214,43 @@ This structure contains information about service state variable. The name of the state variable. -

gboolean send_events;

+

gboolean send_events;

Whether this state variable can source events. -

gboolean is_numeric;

+

gboolean is_numeric;

Wether this state variable is a numeric type (integer and float). -

GType type;

+

GType type;

The GType of this state variable. -

GValue default_value;

+

GValue default_value;

The default value of this state variable. -

GValue minimum;

+

GValue minimum;

The minimum value of this state variable. Only applies to numeric data types. -

GValue maximum;

+

GValue maximum;

The maximum value of this state variable. Only applies to numeric data types. -

GValue step;

+

GValue step;

The step value of this state variable. Only applies to numeric data types. -

GList *allowed_values;

+

GList *allowed_values;

The allowed values of this state variable. Only applies to string data types. Unlike the other fields in this structure, this field -contains a list of (char *) strings rather than GValues. +contains a list of (char *) strings rather than GValues. [element-type utf8] + @@ -265,7 +267,7 @@ functions below.

gupnp_service_introspection_list_action_names ()

-
const GList *       gupnp_service_introspection_list_action_names
+
const GList *       gupnp_service_introspection_list_action_names
                                                         (GUPnPServiceIntrospection *introspection);

 

 Returns a GList of names of all the actions in this service.
@@ -281,7 +283,7 @@ Returns a GList of names of all the actions in this service.
 
 
Returns :

 (transfer none) (element-type utf8) : A GList of names of all
-the actions or NULL. Do not modify or free it or its contents.
+the actions or NULL. Do not modify or free it or its contents.
@@ -289,10 +291,10 @@ the actions or

gupnp_service_introspection_list_actions ()

-
const GList *       gupnp_service_introspection_list_actions
+
const GList *       gupnp_service_introspection_list_actions
                                                         (GUPnPServiceIntrospection *introspection);

 

-Returns a GList of all the actions (of type GUPnPServiceActionInfo) in
+Returns a GList of all the actions (of type GUPnPServiceActionInfo) in
 this service.
 

 

@@ -306,8 +308,8 @@ this service.
 
@@ -318,7 +320,7 @@ contents. [
gupnp_service_introspection_get_action ()

 
const GUPnPServiceActionInfo * gupnp_service_introspection_get_action
                                                         (GUPnPServiceIntrospection *introspection,
-                                                         const gchar *action_name);

+                                                         const gchar *action_name);
 

 Returns the action by the name action_name in this service.
 

@@ -336,7 +338,7 @@ Returns the action by the name action_name
 
-
@@ -346,10 +348,10 @@ it. [
 
gupnp_service_introspection_list_state_variable_names ()

-
const GList *       gupnp_service_introspection_list_state_variable_names
+
const GList *       gupnp_service_introspection_list_state_variable_names
                                                         (GUPnPServiceIntrospection *introspection);

 

-Returns a GList of names of all the state variables in this service.
+Returns a GList of names of all the state variables in this service.
 

 

 
Returns :

 A
-GList of all the actions or NULL. Do not modify or free it or its
-contents. [element-type GUPnP.ServiceActionInfo*][transfer none]
+GList of all the actions or NULL. Do not modify or free it or its
+contents. [element-type GUPnP.ServiceActionInfo][transfer none]
 
 

 

 
Returns :
the action or NULL. Do not modify or free
+the action or NULL. Do not modify or free
 it. [transfer none]
 
 
@@ -361,8 +363,8 @@ Returns a Returns :

-
@@ -371,7 +373,7 @@ the state variables or 
 
gupnp_service_introspection_list_state_variables ()

-
const GList *       gupnp_service_introspection_list_state_variables
+
const GList *       gupnp_service_introspection_list_state_variables
                                                         (GUPnPServiceIntrospection *introspection);

 

 Returns a GList of all the state variables (of type
@@ -387,7 +389,7 @@ Returns a GList of all the state variables (of type
 
 

-
@@ -399,7 +401,7 @@ its contents. [
gupnp_service_introspection_get_state_variable ()

 
const GUPnPServiceStateVariableInfo * gupnp_service_introspection_get_state_variable
                                                         (GUPnPServiceIntrospection *introspection,
-                                                         const gchar *variable_name);

+                                                         const gchar *variable_name);
 

 Returns the state variable by the name variable_name in this service.
 

@@ -417,7 +419,9 @@ Returns the state variable by the name variable_name
 
 
-
+

 

A GList of names of all
-the state variables or NULL. Do not modify or free it or its contents. [element-type utf8][transfer none]
+A GList of names of all
+the state variables or NULL. Do not modify or free it or its contents. [element-type utf8][transfer none]
 
 

 

 
Returns :
A GList of all the state variables or NULL. Do not modify or free it or
+A GList of all the state variables or NULL. Do not modify or free it or
 its contents. [element-type GUPnP.ServiceStateVariableInfo][transfer none]
 
 

 
Returns :
the state variable or NULL. Do not modify or free it.the state variable or NULL. Do not modify or
+free it. [transfer none]
+
 

 
 

@@ -427,7 +431,7 @@ Returns the state variable by the name variable_name
 
Property Details

 

 
The "scpd" property

-
  "scpd"                     gpointer              : Write / Construct Only

+
  "scpd"                     gpointer              : Write / Construct Only

 

 The scpd of the device description file.
 

diff --git a/doc/html/index.html b/doc/html/index.html
index 0d0ee26..0083457 100644
--- a/doc/html/index.html
+++ b/doc/html/index.html
@@ -14,11 +14,11 @@
 

 

 

-
Version 0.18.0
+
Version 0.19.1
 

 
Copyright © 2007, 2008, 2009 OpenedHand Ltd, Nokia Corporation

 

-

+

         Permission is granted to copy, distribute and/or modify this
         document under the terms of the GNU Free
         Documentation License, Version 1.1 or any later
diff --git a/doc/html/index.sgml b/doc/html/index.sgml
index 1a0b29f..3dc7333 100644
--- a/doc/html/index.sgml
+++ b/doc/html/index.sgml
@@ -326,5 +326,6 @@
 
 
 
-
 
+
+
diff --git a/doc/html/ix01.html b/doc/html/ix01.html
index 1f2322b..bed4184 100644
--- a/doc/html/ix01.html
+++ b/doc/html/ix01.html
@@ -20,7 +20,7 @@
 
 

 

-Index

+Index

 

 
G

 

diff --git a/doc/html/server-tutorial.html b/doc/html/server-tutorial.html
index 6af8629..4c9c271 100644
--- a/doc/html/server-tutorial.html
+++ b/doc/html/server-tutorial.html
@@ -24,7 +24,7 @@
 Writing a UPnP Service

 

 

-Introduction

+Introduction

 

       This chapter explains how to implement a UPnP service using GUPnP. For
       this example we will create a virtual UPnP-enabled light bulb.
@@ -32,20 +32,21 @@
 

       Before any code can be written, the device and services that it implement
       need to be described in XML.  Although this can be frustrating, if you are
-      implementing a standardised service (see http://upnp.org/standardizeddcps/ for the list of standard devices
-      and services) then the service description is already written for you and
-      the device description is trivial.  UPnP has standardised Lighting
+      implementing a standardised service (see http://upnp.org/sdcps-and-certification/standards/sdcps/ for the
+      list of standard devices and services) then the service description is
+      already written for you and the device description is trivial.  UPnP has
+      standardised Lighting
       Controls, so we'll be using the device and service types defined
       there.
     

 

 

 

-Defining the Device

+Defining the Device

 

       The first step is to write the device description
       file.  This is a short XML document which describes the device and what
-      services it provides (for more details see the UPnP
+      services it provides (for more details see the UPnP
       Device Architecture specification, section 2.1).  We'll be using
       the BinaryLight1 device type, but if none of the
       existing device types are suitable a custom device type can be created.
@@ -117,7 +118,7 @@
 
 

 

-Defining Services

+Defining Services

 

       Because we are using a standard service we can use the service description
       from the specification.  This is the SwitchPower1
@@ -204,13 +205,13 @@
 

       For the full specification of the service definition file, including a
       complete list of valid dataTypes, see section 2.3 of
-      the UPnP
+      the UPnP
       Device Architecture.
     

 
 

 

-Implementing the Device

+Implementing the Device

 

       Before starting to implement the device, some boilerplate code is needed
       to initialise GUPnP.  GLib types and threading needs to be initialised,
@@ -246,7 +247,7 @@ gupnp_root_device_set_available (dev, TRUE);

-Implementing a Service

+Implementing a Service

To implement a service we first fetch the #GUPnPService from the root device using gupnp_device_info_get_service() (#GUPnPRootDevice is a @@ -355,7 +356,7 @@ g_signal_connect (service, "query-variable::Status", G_CALLBACK (query_status_cb

-Generating Service-specific Wrappers

+Generating Service-specific Wrappers

Using service-specific wrappers can simplify the implementation of a service. Wrappers can be generated with gupnp-binding-tool(1) diff --git a/examples/Makefile.in b/examples/Makefile.in index 9fa4f5b..87550b9 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -43,7 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -96,6 +113,11 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(light_client_SOURCES) $(light_server_SOURCES) DIST_SOURCES = $(light_client_SOURCES) $(light_server_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -191,6 +213,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NETLINK = @USE_NETLINK@ +VAPIGEN = @VAPIGEN@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ diff --git a/gupnp-1.0-uninstalled.pc.in b/gupnp-1.0-uninstalled.pc.in index 601e478..40e75ca 100644 --- a/gupnp-1.0-uninstalled.pc.in +++ b/gupnp-1.0-uninstalled.pc.in @@ -8,5 +8,4 @@ Description: GObject-based UPnP library Version: @VERSION@ Libs: ${libdir}/libgupnp-1.0.la Cflags: -I${includedir} -Requires: gssdp-1.0 libxml-2.0 libsoup-2.4 -Requires.Private: uuid gmodule-2.0 +Requires.private: gssdp-1.0 libxml-2.0 libsoup-2.4 diff --git a/gupnp-1.0.pc.in b/gupnp-1.0.pc.in index d4acdd2..d2612b4 100644 --- a/gupnp-1.0.pc.in +++ b/gupnp-1.0.pc.in @@ -8,5 +8,4 @@ Description: GObject-based UPnP library Version: @VERSION@ Libs: -L${libdir} -lgupnp-1.0 Cflags: -I${includedir}/gupnp-1.0 -Requires: gssdp-1.0 libxml-2.0 libsoup-2.4 -Requires.Private: uuid gmodule-2.0 +Requires.private: gssdp-1.0 libxml-2.0 libsoup-2.4 diff --git a/libgupnp/Makefile.am b/libgupnp/Makefile.am index 46a37b4..864e450 100644 --- a/libgupnp/Makefile.am +++ b/libgupnp/Makefile.am @@ -117,7 +117,8 @@ INTROSPECTION_GIRS = INTROSPECTION_SCANNER_ARGS = --warn-all \ --symbol-prefix=gupnp \ --identifier-prefix=GUPnP \ - --add-include-path=$(top_srcdir) + --add-include-path=$(top_srcdir) \ + --pkg-export=gupnp-1.0 INTROSPECTION_COMPILER_ARGS = --includedir=$(top_srcdir) if HAVE_INTROSPECTION diff --git a/libgupnp/Makefile.in b/libgupnp/Makefile.in index 2ea4678..04c2da9 100644 --- a/libgupnp/Makefile.in +++ b/libgupnp/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -18,6 +18,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,7 +73,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -169,6 +186,11 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libgupnp_1_0_la_SOURCES) DIST_SOURCES = $(am__libgupnp_1_0_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(gir_DATA) $(typelib_DATA) HEADERS = $(libgupnpinc_HEADERS) ETAGS = etags @@ -266,6 +288,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NETLINK = @USE_NETLINK@ +VAPIGEN = @VAPIGEN@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -409,7 +432,8 @@ INTROSPECTION_GIRS = $(am__append_4) INTROSPECTION_SCANNER_ARGS = --warn-all \ --symbol-prefix=gupnp \ --identifier-prefix=GUPnP \ - --add-include-path=$(top_srcdir) + --add-include-path=$(top_srcdir) \ + --pkg-export=gupnp-1.0 INTROSPECTION_COMPILER_ARGS = --includedir=$(top_srcdir) @HAVE_INTROSPECTION_TRUE@GUPnP_1_0_gir_INCLUDES = libxml2-2.0 GObject-2.0 Soup-2.4 GSSDP-1.0 @@ -462,7 +486,6 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -470,6 +493,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ } @@ -553,8 +578,11 @@ clean-libtool: -rm -rf .libs _libs install-girDATA: $(gir_DATA) @$(NORMAL_INSTALL) - test -z "$(girdir)" || $(MKDIR_P) "$(DESTDIR)$(girdir)" @list='$(gir_DATA)'; test -n "$(girdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(girdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(girdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -571,8 +599,11 @@ uninstall-girDATA: dir='$(DESTDIR)$(girdir)'; $(am__uninstall_files_from_dir) install-typelibDATA: $(typelib_DATA) @$(NORMAL_INSTALL) - test -z "$(typelibdir)" || $(MKDIR_P) "$(DESTDIR)$(typelibdir)" @list='$(typelib_DATA)'; test -n "$(typelibdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(typelibdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(typelibdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -589,8 +620,11 @@ uninstall-typelibDATA: dir='$(DESTDIR)$(typelibdir)'; $(am__uninstall_files_from_dir) install-libgupnpincHEADERS: $(libgupnpinc_HEADERS) @$(NORMAL_INSTALL) - test -z "$(libgupnpincdir)" || $(MKDIR_P) "$(DESTDIR)$(libgupnpincdir)" @list='$(libgupnpinc_HEADERS)'; test -n "$(libgupnpincdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libgupnpincdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libgupnpincdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff --git a/libgupnp/gupnp-context-manager.c b/libgupnp/gupnp-context-manager.c index dbac15d..2888a1b 100644 --- a/libgupnp/gupnp-context-manager.c +++ b/libgupnp/gupnp-context-manager.c @@ -415,3 +415,17 @@ gupnp_context_manager_manage_root_device (GUPnPContextManager *manager, g_object_ref (root_device)); } +/** + * gupnp_context_manager_get_port: + * @manager: A #GUPnPContextManager + * + * Get the network port associated with this context manager. + * Returns: The network port asssociated with this context manager. + */ +guint +gupnp_context_manager_get_port (GUPnPContextManager *manager) +{ + g_return_if_fail (GUPNP_IS_CONTEXT_MANAGER (manager)); + + return manager->priv->port; +} diff --git a/libgupnp/gupnp-context-manager.h b/libgupnp/gupnp-context-manager.h index 2782898..9fa2154 100644 --- a/libgupnp/gupnp-context-manager.h +++ b/libgupnp/gupnp-context-manager.h @@ -99,6 +99,8 @@ gupnp_context_manager_manage_root_device (GUPnPContextManager *manager, GUPnPRootDevice *root_device); +guint +gupnp_context_manager_get_port (GUPnPContextManager *manager); G_END_DECLS #endif /* __GUPNP_CONTEXT_MANAGER_H__ */ diff --git a/libgupnp/gupnp-context.c b/libgupnp/gupnp-context.c index d62a17a..114b1b3 100644 --- a/libgupnp/gupnp-context.c +++ b/libgupnp/gupnp-context.c @@ -545,9 +545,10 @@ _gupnp_context_get_server_url (GUPnPContext *context) /** * gupnp_context_new: - * @main_context: Deprecated: 0.17.2: Always set to %NULL. If you want to use - * a different context, use g_main_context_push_thread_default(). - * @interface: The network interface to use, or %NULL to auto-detect. + * @main_context: (allow-none): Deprecated: 0.17.2: Always set to %NULL. If you + * want to use a different context, use g_main_context_push_thread_default(). + * @interface: (allow-none): The network interface to use, or %NULL to + * auto-detect. * @port: Port to run on, or 0 if you don't care what port is used. * @error: A location to store a #GError, or %NULL * diff --git a/libgupnp/gupnp-device-info.c b/libgupnp/gupnp-device-info.c index a2f4cd5..4f6fe2b 100644 --- a/libgupnp/gupnp-device-info.c +++ b/libgupnp/gupnp-device-info.c @@ -101,11 +101,7 @@ gupnp_device_info_set_property (GObject *object, info->priv->device_type = g_value_dup_string (value); break; case PROP_URL_BASE: - info->priv->url_base = g_value_get_pointer (value); - if (info->priv->url_base) - info->priv->url_base = - soup_uri_copy (info->priv->url_base); - + info->priv->url_base = g_value_dup_boxed (value); break; case PROP_DOCUMENT: info->priv->doc = g_value_dup_object (value); @@ -151,8 +147,7 @@ gupnp_device_info_get_property (GObject *object, gupnp_device_info_get_device_type (info)); break; case PROP_URL_BASE: - g_value_set_pointer (value, - info->priv->url_base); + g_value_set_boxed (value, info->priv->url_base); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); @@ -314,14 +309,15 @@ gupnp_device_info_class_init (GUPnPDeviceInfoClass *klass) g_object_class_install_property (object_class, PROP_URL_BASE, - g_param_spec_pointer ("url-base", - "URL base", - "The URL base", - G_PARAM_READWRITE | - G_PARAM_CONSTRUCT_ONLY | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_NICK | - G_PARAM_STATIC_BLURB)); + g_param_spec_boxed ("url-base", + "URL base", + "The URL base", + SOUP_TYPE_URI, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_BLURB)); /** * GUPnPDeviceInfo:document: @@ -1109,7 +1105,7 @@ gupnp_device_info_list_device_types (GUPnPDeviceInfo *info) * this function a new object is created. The application must cache any used * devices if it wishes to keep them around and re-use them. * - * Returns: (transfer full): A new #GUPnPDeviceInfo. + * Returns: (transfer full)(allow-none): A new #GUPnPDeviceInfo. **/ GUPnPDeviceInfo * gupnp_device_info_get_device (GUPnPDeviceInfo *info, diff --git a/libgupnp/gupnp-service-info.c b/libgupnp/gupnp-service-info.c index fd3f785..8849a67 100644 --- a/libgupnp/gupnp-service-info.c +++ b/libgupnp/gupnp-service-info.c @@ -118,11 +118,7 @@ gupnp_service_info_set_property (GObject *object, info->priv->service_type = g_value_dup_string (value); break; case PROP_URL_BASE: - info->priv->url_base = g_value_get_pointer (value); - if (info->priv->url_base) - info->priv->url_base = - soup_uri_copy (info->priv->url_base); - + info->priv->url_base = g_value_dup_boxed (value); break; case PROP_DOCUMENT: info->priv->doc = g_value_dup_object (value); @@ -164,8 +160,8 @@ gupnp_service_info_get_property (GObject *object, gupnp_service_info_get_service_type (info)); break; case PROP_URL_BASE: - g_value_set_pointer (value, - info->priv->url_base); + g_value_set_boxed (value, + info->priv->url_base); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); @@ -326,14 +322,15 @@ gupnp_service_info_class_init (GUPnPServiceInfoClass *klass) g_object_class_install_property (object_class, PROP_URL_BASE, - g_param_spec_pointer ("url-base", - "URL base", - "The URL base", - G_PARAM_READWRITE | - G_PARAM_CONSTRUCT_ONLY | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_NICK | - G_PARAM_STATIC_BLURB)); + g_param_spec_boxed ("url-base", + "URL base", + "The URL base", + SOUP_TYPE_URI, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_BLURB)); /** * GUPnPServiceInfo:document: diff --git a/libgupnp/gupnp-service-introspection.c b/libgupnp/gupnp-service-introspection.c index 2eb3bc3..e3335f3 100644 --- a/libgupnp/gupnp-service-introspection.c +++ b/libgupnp/gupnp-service-introspection.c @@ -786,7 +786,7 @@ gupnp_service_introspection_list_action_names * Returns a #GList of all the actions (of type #GUPnPServiceActionInfo) in * this service. * - * Return value: (element-type GUPnP.ServiceActionInfo*) (transfer none): A + * Return value: (element-type GUPnP.ServiceActionInfo) (transfer none): A * #GList of all the actions or %NULL. Do not modify or free it or its * contents. **/ @@ -855,7 +855,8 @@ state_variable_search_func (GUPnPServiceStateVariableInfo *variable, * * Returns the state variable by the name @variable_name in this service. * - * Return value: the state variable or %NULL. Do not modify or free it. + * Return value: (transfer none): the state variable or %NULL. Do not modify or + * free it. **/ const GUPnPServiceStateVariableInfo * gupnp_service_introspection_get_state_variable diff --git a/libgupnp/gupnp-service-introspection.h b/libgupnp/gupnp-service-introspection.h index 76d1dc3..54d9e90 100644 --- a/libgupnp/gupnp-service-introspection.h +++ b/libgupnp/gupnp-service-introspection.h @@ -85,7 +85,7 @@ typedef struct { /** * GUPnPServiceActionInfo: * @name: The name of the action argument. - * @arguments: A GList of all the arguments + * @arguments: (type GList) (element-type GUPnP.ServiceActionArgInfo):A GList of all the arguments * (of type #GUPnPServiceActionArgInfo) of this action. * * This structure contains information about a service action. @@ -109,7 +109,7 @@ typedef struct { * data types. * @step: The step value of this state variable. Only applies to numeric * data types. - * @allowed_values: The allowed values of this state variable. Only applies to + * @allowed_values: (element-type utf8): The allowed values of this state variable. Only applies to * string data types. Unlike the other fields in this structure, this field * contains a list of (char *) strings rather than GValues. * diff --git a/libgupnp/gupnp-service-proxy.c b/libgupnp/gupnp-service-proxy.c index dc75ba1..04811ca 100644 --- a/libgupnp/gupnp-service-proxy.c +++ b/libgupnp/gupnp-service-proxy.c @@ -348,7 +348,7 @@ gupnp_service_proxy_class_init (GUPnPServiceProxyClass *klass) /** * GUPnPServiceProxy::subscription-lost: * @proxy: The #GUPnPServiceProxy that received the signal - * @error: A pointer to a #GError describing why the subscription has + * @error: (type GError):A pointer to a #GError describing why the subscription has * been lost * * Emitted whenever the subscription to this service has been lost due @@ -967,7 +967,7 @@ gupnp_service_proxy_begin_action_list * @callback: (scope async): The callback to call when sending the action has succeeded * or failed * @user_data: User data for @callback - * @hash: A #GHashTable of in parameter name and #GValue pairs + * @hash: (element-type utf8 GValue): A #GHashTable of in parameter name and #GValue pairs * * See gupnp_service_proxy_begin_action(); this version takes a #GHashTable * for runtime generated parameter lists. diff --git a/libgupnp/gupnp-service.c b/libgupnp/gupnp-service.c index 76c3e9d..2eb2a43 100644 --- a/libgupnp/gupnp-service.c +++ b/libgupnp/gupnp-service.c @@ -458,7 +458,7 @@ gupnp_service_action_get_values (GUPnPServiceAction *action, * gupnp_service_action_get_value: (skip) * @action: A #GUPnPServiceAction * @argument: The name of the argument to retrieve - * @value: The #GValue to store the value of the argument, initialized + * @value: (inout):The #GValue to store the value of the argument, initialized * to the correct type. * * Retrieves the value of @argument into @value. @@ -1669,7 +1669,7 @@ gupnp_service_class_init (GUPnPServiceClass *klass) * GUPnPService::query-variable: * @service: The #GUPnPService that received the signal * @variable: The variable that is being queried - * @value: The location of the #GValue of the variable + * @value: (type GValue)(inout):The location of the #GValue of the variable * * Emitted whenever @service needs to know the value of @variable. * Handler should fill @value with the value of @variable. @@ -1692,8 +1692,8 @@ gupnp_service_class_init (GUPnPServiceClass *klass) /** * GUPnPService::notify-failed: * @service: The #GUPnPService that received the signal - * @callback_url: The callback URL - * @reason: A pointer to a #GError describing why the notify failed + * @callback_url: (type GList)(element-type SoupURI):A #GList of callback URLs + * @reason: (type GError): A pointer to a #GError describing why the notify failed * * Emitted whenever notification of a client fails. **/ diff --git a/libgupnp/gupnp-service.h b/libgupnp/gupnp-service.h index d81e4b9..ae73c89 100644 --- a/libgupnp/gupnp-service.h +++ b/libgupnp/gupnp-service.h @@ -83,6 +83,7 @@ struct _GUPnPService { struct _GUPnPServiceClass { GUPnPServiceInfoClass parent_class; + /* */ void (* action_invoked) (GUPnPService *service, GUPnPServiceAction *action); diff --git a/m4/vapigen.m4 b/m4/vapigen.m4 new file mode 100644 index 0000000..df6395d --- /dev/null +++ b/m4/vapigen.m4 @@ -0,0 +1,41 @@ + +dnl vala.m4 +dnl +dnl Copyright 2010 Marc-Andre Lureau +dnl Copyright 2011 Rodney Dawes +dnl +dnl This library is free software; you can redistribute it and/or +dnl modify it under the terms of the GNU Lesser General Public +dnl License as published by the Free Software Foundation; either +dnl version 2.1 of the License, or (at your option) any later version. +dnl +dnl This library is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl Lesser General Public License for more details. +dnl +dnl You should have received a copy of the GNU Lesser General Public +dnl License along with this library; if not, write to the Free Software +dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +dnl dropped everything but VALA_PROG_VAPIGEN - Jens Georg + +# Check whether the Vala API Generator exists in `PATH'. If it is found, +# the variable VAPIGEN is set. Optionally a minimum release number of the +# generator can be requested. +# +# VALA_PROG_VAPIGEN([MINIMUM-VERSION]) +# ------------------------------------ +AC_DEFUN([VALA_PROG_VAPIGEN], +[AC_PATH_PROG([VAPIGEN], [vapigen], []) + AS_IF([test -z "$VAPIGEN"], + [AC_MSG_WARN([No Vala API Generator found. You will not be able to generate .vapi files.])], + [AS_IF([test -n "$1"], + [AC_MSG_CHECKING([$VAPIGEN is at least version $1]) + am__vapigen_version=`$VAPIGEN --version | sed 's/Vala API Generator *//'` + AS_VERSION_COMPARE([$1], ["$am__vapigen_version"], + [AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no]) + AC_MSG_WARN([Vala API Generator $1 not found.])])])]) +]) diff --git a/packaging/GUPnP.changes b/packaging/GUPnP.changes index 27b5a22..cdc2fd0 100644 --- a/packaging/GUPnP.changes +++ b/packaging/GUPnP.changes @@ -1,2 +1,5 @@ +* Tue Nov 13 19:04:20 CET 2012 - Mark Ryan +- Submit version 0.19.1 (24bd15c) of GUPnP + * Wed Sep 12 13:42:24 CEST 2012 - Mark Ryan - Submit version 0.18.0 (fcd9eb4) of GUPnP diff --git a/packaging/GUPnP.spec b/packaging/GUPnP.spec index 33ae3e8..fcc0fdd 100644 --- a/packaging/GUPnP.spec +++ b/packaging/GUPnP.spec @@ -7,12 +7,12 @@ Name: gupnp Summary: GUPnP is an framework for creating UPnP devices & control points -Version: 0.18.0 +Version: 0.19.1 Release: 1 Group: System/Libraries License: LGPLv2+ URL: http://www.gupnp.org/ -Source0: http://download.gnome.org/sources/%{name}/0.18/%{name}-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/%{name}/0.19/%{name}-%{version}.tar.bz2 Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig BuildRequires: pkgconfig(glib-2.0) diff --git a/tests/Makefile.in b/tests/Makefile.in index b130b38..6c815c6 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -44,7 +61,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -113,6 +130,11 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -239,6 +261,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NETLINK = @USE_NETLINK@ +VAPIGEN = @VAPIGEN@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -583,13 +606,10 @@ distdir: $(DISTFILES) done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff --git a/tests/gtest/Makefile.in b/tests/gtest/Makefile.in index 13202f5..938cf5d 100644 --- a/tests/gtest/Makefile.in +++ b/tests/gtest/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -42,7 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -87,6 +104,11 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(test_context_SOURCES) DIST_SOURCES = $(am__test_context_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags am__tty_colors = \ @@ -184,6 +206,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NETLINK = @USE_NETLINK@ +VAPIGEN = @VAPIGEN@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ diff --git a/tools/Makefile.in b/tools/Makefile.in index 7861721..21f19e5 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -43,7 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -87,6 +104,11 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -180,6 +202,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ USE_NETLINK = @USE_NETLINK@ +VAPIGEN = @VAPIGEN@ VERSION = @VERSION@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -273,8 +296,11 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): install-dist_binSCRIPTS: $(dist_bin_SCRIPTS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(dist_bin_SCRIPTS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ diff --git a/vala/GUPnP-1.0.metadata b/vala/GUPnP-1.0.metadata new file mode 100644 index 0000000..50f14b1 --- /dev/null +++ b/vala/GUPnP-1.0.metadata @@ -0,0 +1,38 @@ +GUPnP cheader_filename="libgupnp/gupnp.h" +ContextManager + .main_context skip + .new skip +DeviceInfo + .get_device nullable=true + .get_service nullable=true + .element skip + .document skip +Service + .notify skip=false + .signals_autoconnect skip +ServiceAction + .get skip=false + .get_value skip=false + .set skip=false +ServiceInfo + .document skip + .element skip + .get_introspection nullable=true +ServiceIntrospection + .get_action nullable=true unowned=true + .get_state_variable nullable=true unowned=true + .scpd skip +ServiceProxy + .begin_action skip=false + .end_action_hash skip + .end_action_list skip + .send_action_hash skip + .send_action_list skip +ControlError skip +control_error_quark skip +EventingError skip +eventing_error_quark skip +ServerError skip +server_error_quark skip +XMLError skip +xml_error_quark skip diff --git a/vala/Makefile.am b/vala/Makefile.am new file mode 100644 index 0000000..e8822d3 --- /dev/null +++ b/vala/Makefile.am @@ -0,0 +1,21 @@ +if HAVE_INTROSPECTION +if HAVE_VAPIGEN +gupnp-1.0.vapi: gupnp-1.0.stamp + @true + +gupnp-1.0.stamp: $(top_builddir)/libgupnp/GUPnP-1.0.gir \ + $(srcdir)/GUPnP-1.0.metadata \ + $(srcdir)/gupnp-1.0-custom.vala + $(AM_V_GEN)$(VAPIGEN) --metadatadir=$(srcdir) \ + --pkg=libsoup-2.4 \ + --library=gupnp-1.0 --pkg=gio-2.0 --pkg=libxml-2.0 \ + $(top_builddir)/libgupnp/GUPnP-1.0.gir \ + $(srcdir)/gupnp-1.0-custom.vala && \ + echo timestmap > $(@F) + +vapidir = $(datadir)/vala/vapi +vapi_DATA = gupnp-1.0.vapi $(srcdir)/gupnp-1.0.deps +CLEANFILES = gupnp-1.0.vapi gupnp-1.0.stamp +EXTRA_DIST = gupnp-1.0.deps GUPnP-1.0.metadata gupnp-1.0-custom.vala +endif +endif diff --git a/vala/Makefile.in b/vala/Makefile.in new file mode 100644 index 0000000..771f25f --- /dev/null +++ b/vala/Makefile.in @@ -0,0 +1,496 @@ +# Makefile.in generated by automake 1.11.6 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +target_triplet = @target@ +subdir = vala +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ + $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/vapigen.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +SOURCES = +DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(vapidir)" +DATA = $(vapi_DATA) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CONNMAN_CFLAGS = @CONNMAN_CFLAGS@ +CONNMAN_LIBS = @CONNMAN_LIBS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GIO_CFLAGS = @GIO_CFLAGS@ +GIO_LIBS = @GIO_LIBS@ +GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ +GREP = @GREP@ +GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ +GTHREAD_LIBS = @GTHREAD_LIBS@ +GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ +GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ +GTKDOC_MKPDF = @GTKDOC_MKPDF@ +GTKDOC_REBASE = @GTKDOC_REBASE@ +GTest_CFLAGS = @GTest_CFLAGS@ +GTest_LIBS = @GTest_LIBS@ +HAVE_NETLINK = @HAVE_NETLINK@ +HTML_DIR = @HTML_DIR@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ +INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ +INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@ +INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@ +INTROSPECTION_LIBS = @INTROSPECTION_LIBS@ +INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@ +INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ +INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBGUPNP_CFLAGS = @LIBGUPNP_CFLAGS@ +LIBGUPNP_LIBS = @LIBGUPNP_LIBS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +USE_NETLINK = @USE_NETLINK@ +VAPIGEN = @VAPIGEN@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +@HAVE_INTROSPECTION_TRUE@@HAVE_VAPIGEN_TRUE@vapidir = $(datadir)/vala/vapi +@HAVE_INTROSPECTION_TRUE@@HAVE_VAPIGEN_TRUE@vapi_DATA = gupnp-1.0.vapi $(srcdir)/gupnp-1.0.deps +@HAVE_INTROSPECTION_TRUE@@HAVE_VAPIGEN_TRUE@CLEANFILES = gupnp-1.0.vapi gupnp-1.0.stamp +@HAVE_INTROSPECTION_TRUE@@HAVE_VAPIGEN_TRUE@EXTRA_DIST = gupnp-1.0.deps GUPnP-1.0.metadata gupnp-1.0-custom.vala +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu vala/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu vala/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +install-vapiDATA: $(vapi_DATA) + @$(NORMAL_INSTALL) + @list='$(vapi_DATA)'; test -n "$(vapidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(vapidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(vapidir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(vapidir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(vapidir)" || exit $$?; \ + done + +uninstall-vapiDATA: + @$(NORMAL_UNINSTALL) + @list='$(vapi_DATA)'; test -n "$(vapidir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(vapidir)'; $(am__uninstall_files_from_dir) +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(DATA) +installdirs: + for dir in "$(DESTDIR)$(vapidir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-vapiDATA + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-vapiDATA + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + install-vapiDATA installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + uninstall uninstall-am uninstall-vapiDATA + +@HAVE_INTROSPECTION_TRUE@@HAVE_VAPIGEN_TRUE@gupnp-1.0.vapi: gupnp-1.0.stamp +@HAVE_INTROSPECTION_TRUE@@HAVE_VAPIGEN_TRUE@ @true + +@HAVE_INTROSPECTION_TRUE@@HAVE_VAPIGEN_TRUE@gupnp-1.0.stamp: $(top_builddir)/libgupnp/GUPnP-1.0.gir \ +@HAVE_INTROSPECTION_TRUE@@HAVE_VAPIGEN_TRUE@ $(srcdir)/GUPnP-1.0.metadata \ +@HAVE_INTROSPECTION_TRUE@@HAVE_VAPIGEN_TRUE@ $(srcdir)/gupnp-1.0-custom.vala +@HAVE_INTROSPECTION_TRUE@@HAVE_VAPIGEN_TRUE@ $(AM_V_GEN)$(VAPIGEN) --metadatadir=$(srcdir) \ +@HAVE_INTROSPECTION_TRUE@@HAVE_VAPIGEN_TRUE@ --pkg=libsoup-2.4 \ +@HAVE_INTROSPECTION_TRUE@@HAVE_VAPIGEN_TRUE@ --library=gupnp-1.0 --pkg=gio-2.0 --pkg=libxml-2.0 \ +@HAVE_INTROSPECTION_TRUE@@HAVE_VAPIGEN_TRUE@ $(top_builddir)/libgupnp/GUPnP-1.0.gir \ +@HAVE_INTROSPECTION_TRUE@@HAVE_VAPIGEN_TRUE@ $(srcdir)/gupnp-1.0-custom.vala && \ +@HAVE_INTROSPECTION_TRUE@@HAVE_VAPIGEN_TRUE@ echo timestmap > $(@F) + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/vala/gupnp-1.0-custom.vala b/vala/gupnp-1.0-custom.vala new file mode 100644 index 0000000..9f3c5b3 --- /dev/null +++ b/vala/gupnp-1.0-custom.vala @@ -0,0 +1,68 @@ +/* + * Copyright (C) 2012 Jens Georg + * + * Author: Jens Georg + * + * This file is part of GUPnP. + * + * GUPnP 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. + * + * GUPnP 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. + */ + +public class GUPnP.ServiceProxy : GUPnP.ServiceInfo { + public bool send_action (string action, ...) throws GLib.Error; + public bool end_action (GUPnP.ServiceProxyAction action, ...) throws GLib.Error; + public bool end_action_hash (GUPnP.ServiceProxyAction action, [CCode (pos=-0.9)] GLib.HashTable hash) throws GLib.Error; + public bool end_action_list (GUPnP.ServiceProxyAction action, [CCode (pos=-0.9)] GLib.List out_names, [CCode (pos=-0.8)] GLib.List out_types, [CCode (pos=-0.7)] out GLib.List out_values) throws GLib.Error; + + public bool send_action_hash (string action, [CCode (pos=-0.9)] GLib.HashTable in_hash, [CCode (pos=-0.8)] GLib.HashTable out_hash) throws GLib.Error; + public bool send_action_list (string action, [CCode (pos=-0.9)] GLib.List in_names, [CCode (pos=-0.8)] GLib.List in_values, [CCode (pos=-0.7)] GLib.List out_names, [CCode (pos=-0.6)] GLib.List out_types, [CCode (pos=-0.5)] out GLib.List out_values) throws GLib.Error; +} + +namespace GUPnP { + [CCode (cheader_filename = "libgupnp/gupnp.h", cprefix = "GUPNP_CONTROL_ERROR_")] + public errordomain ControlError { + INVALID_ACTION, + INVALID_ARGS, + OUT_OF_SYNC, + ACTION_FAILED; + public static GLib.Quark quark (); + } + [CCode (cheader_filename = "libgupnp/gupnp.h", cprefix = "GUPNP_EVENTING_ERROR_")] + public errordomain EventingError { + SUBSCRIPTION_FAILED, + SUBSCRIPTION_LOST, + NOTIFY_FAILED; + public static GLib.Quark quark (); + } + [CCode (cheader_filename = "libgupnp/gupnp.h", cprefix = "GUPNP_SERVER_ERROR_")] + public errordomain ServerError { + INTERNAL_SERVER_ERROR, + NOT_FOUND, + NOT_IMPLEMENTED, + INVALID_RESPONSE, + INVALID_URL, + OTHER; + public static GLib.Quark quark (); + } + [CCode (cheader_filename = "libgupnp/gupnp.h", cprefix = "GUPNP_XML_ERROR_")] + public errordomain XMLError { + PARSE, + NO_NODE, + EMPTY_NODE, + INVALID_ATTRIBUTE, + OTHER; + public static GLib.Quark quark (); + } +} diff --git a/vala/gupnp-1.0.deps b/vala/gupnp-1.0.deps new file mode 100644 index 0000000..52e8225 --- /dev/null +++ b/vala/gupnp-1.0.deps @@ -0,0 +1,3 @@ +gssdp-1.0 +libsoup-2.4 +libxml-2.0 -- 2.7.4