diff --git a/ChangeLog b/ChangeLog index 13e545a..c4b9f5e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,210 @@ +commit 629bea3bfcf0c6698055b5bf6811485b330d335b +Author: Simon McVittie +Date: 2012-04-20 17:07:25 +0100 + + Prepare 0.18.1 + +commit bab960e0f3f63a52850e76b80b3dae77ea9c174d +Author: Xavier Claessens +Date: 2012-04-03 11:50:15 +0200 + + TpAM: Document that _set_default() keeps an internal reference + +commit 57e23d6d7788498061349649e9b4bccf9ea7bf7b +Author: Xavier Claessens +Date: 2012-04-16 17:42:33 +0200 + + Do not use _tp_connection_lookup_contact() outside contact.c + + That function is dangerous because it does not guarantee that the returned TpContact + has an identifier set. + + In the case a TpContact is being created with tp_connection_get_contacts_by_id(), + the first step is to inspect its handle and then create the TpContact object + *without* giving its ID. The id will be set later once we got the contact attributes. + + If _tp_connection_lookup_contact() is called for the same handle/id between + the moment the TpContact is created and the moment it sets its attributes, then + a contact with no identifier is returned. + +commit 66d1a078e9d52791ad53db2ce7a94e817e86d12e +Author: Simon McVittie +Date: 2012-04-13 12:38:26 +0100 + + NEWS + +commit 892174994149b1266f266833f90e73e6a727945c +Author: Simon McVittie +Date: 2012-04-12 16:55:47 +0100 + + Don't make g-ir-scanner warnings fatal on this stable branch + + Reviewed-by: Jonny Lamb + +commit c992c64af097576d1023dc793a6d4752360ff564 +Author: Alban Browaeys +Date: 2012-04-10 00:48:08 +0200 + + Codegen: fix comment line start leftover. + + Generated telepathy-glib/_gen/telepathy-enums-gtk-doc.h from: + /usr/bin/python ../tools/c-constants-gen.py Tp + _gen/stable-spec.xml _gen/telepathy-enums + has incorrect comment. Fix it with the same remedy as + in 5c58330c32f39a9dd6aaaef37f54461922cf6124 + "many fixes to documentation comments" + ie remove the newline between '*' and identifier. + + Reviewed-by: Simon McVittie + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=48363 + +commit 0065a23ce403becdaf86139b5bb29d0d9fe2f3cc +Author: Stef Walter +Date: 2012-04-12 16:30:13 +0200 + + Fix gtk-doc comments for auto-generated constants headers + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=48592 + Reviewed-by: Simon McVittie + +commit a769d111600b58452622279128f040f50ebe48f6 +Author: Simon McVittie +Date: 2012-04-12 14:01:40 +0100 + + dbus-tube-chan test: listen on a random address appropriate for the OS + + Instead of hard-coding the abstract Unix socket '\000dbus-tube-test', + listen on a random (abstract or real) Unix socket in /tmp if on Unix, + or a random port on 127.0.0.1 if not. These are the same listening + addresses I used in test/loopback.c in libdbus. The Unix version also + matches what the session bus normally uses. + + This fixes the test on non-Linux Unix (not insisting on + abstract-namespace sockets working), when run twice in parallel on Linux + (not insisting on using a particular hard-coded name), and in theory + also on Windows (not trying to use Unix sockets). + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=48600 + Signed-off-by: Simon McVittie + Reviewed-by: Guillaume Desmottes + +commit 3302343b9dbe8246e1fda0d75db2145d8a9520bd +Author: Simon McVittie +Date: 2012-04-12 13:27:04 +0100 + + Upload documentation to the 0.18.x location + +commit e0329bd9ccc05b095c38fde993289db4912c09d5 +Author: Simon McVittie +Date: 2010-09-20 12:07:15 +0100 + + Don't check documentation completeness in this stable branch + +commit 07d4cb30fa07bf3dca05bc77aa28170ba062c77e +Author: Simon McVittie +Date: 2010-04-06 12:33:21 +0100 + + Disable warnings about deprecated functions for stable branch + + Since this is a stable branch, we're unlikely to fix uses of + deprecated functions, so we shouldn't warn about them. + +commit abacdfed03e8e0247e29d760a138400f3868e95b +Author: Simon McVittie +Date: 2012-04-12 12:53:00 +0100 + + NEWS + +commit 114a16ba3f91dfa700770ec817ff3f8b4061e0a7 +Author: Stef Walter +Date: 2012-04-12 11:46:52 +0200 + + Fix doc comments for recent stricter gtk-doc + + * Build fails with new gtk-doc (1.18.1) which seems to + be stricter than previous versions. + + [Also fixes g-ir-scanner warnings, which were what was actually fatal. -smcv] + + Bug: https://bugs.freedesktop.org/show_bug.cgi?id=48592 + Reviewed-by: Simon McVittie + +commit e2b5e25a33edc03682b61b307d640dfbf3b72e6c +Author: Simon McVittie +Date: 2012-04-12 11:51:35 +0100 + + 0.18 NEWS + +commit 76b0d3cc3f6dd10f1f88a7e7b1d57a88ac531a08 +Author: Guillaume Desmottes +Date: 2012-04-04 11:04:41 +0200 + + the right GLib macro is GLIB_VERSION_MAX_ALLOWED + +commit 08f4a05e33f8a3fa2fe0e326014dbaccc7c55be6 +Author: Guillaume Desmottes +Date: 2012-04-03 15:54:12 +0200 + + add stream-tubes.py/accepter.py + +commit 8c31202992b37f0e387f67ca0100df2e1643c889 +Author: Guillaume Desmottes +Date: 2012-04-03 15:54:12 +0200 + + add stream-tubes.py/offerer.py + +commit cf0e9d8b366792a9df8303778fcda2dec21217ea +Author: Guillaume Desmottes +Date: 2012-04-03 15:48:42 +0200 + + Fix the type of the TpStreamTubeConnection::closed signal + + python-gobject can't bind G_TYPE_POINTER. + + This seems to be save from an API/ABI pov according to GLib gurus, + we'll just copy the GError instead of passing the same pointer: + +commit e17cd19f2341eeafa666301580fed1f0a77c83a6 +Author: Guillaume Desmottes +Date: 2012-04-03 14:43:50 +0200 + + stream tube examples: send \n with data + + This will allow us to use g_data_input_stream_read_line_utf8() in Python as + g_input_stream_read() is not bindable. + +commit b985cb3474132a802df647e0438a2872c02c71fa +Author: Guillaume Desmottes +Date: 2012-04-03 14:43:50 +0200 + + stream tube examples: use tp_channel_close_async() + +commit 55582d8af3627adf09ebf6ac586753ad4f6abe59 +Author: Guillaume Desmottes +Date: 2012-04-03 14:43:50 +0200 + + stream tube examples: split sending/receiving data debug messages + + Make it easier to understand/debug what's going on. + +commit c93cd8f2bbb9c8888ba3a4ad153a485e33568a4c +Author: Xavier Claessens +Date: 2012-04-03 14:11:34 +0200 + + Introspect a few getters + + It is not always a good idea for bindings to always rely on GObject::get_property(), + it can be slow to access properties that way everytime instead of keeping + a proxy object in native language. + +commit 0dfebb47ded9af7128e641ac90a032e13c2be7f4 +Author: Jonny Lamb +Date: 2012-04-02 16:43:12 -0400 + + start on version 0.18.1 + + Signed-off-by: Jonny Lamb + commit 95b3336d2d43fdbfe61692144dca8700e0ad0071 Author: Jonny Lamb Date: 2012-04-02 16:31:18 -0400 diff --git a/Makefile.am b/Makefile.am index 1948f35..30bfbb1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -37,7 +37,7 @@ maintainer-upload-release: _maintainer-upload-release-local _maintainer-upload-release-local: _maintainer-upload-release-check rsync -rvzPp --chmod=Dg+s,ug+rwX,o=rX $(builddir)/docs/reference/html/ \ - telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/doc/telepathy-glib/ + telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/doc/telepathy-glib-0.18.x/ BRANCH = $(shell sh tools/git-which-branch.sh misc | tr -d '\n' | tr -C "[:alnum:]" _) UPLOAD_BRANCH_TO = people.freedesktop.org:public_html/telepathy-glib diff --git a/Makefile.in b/Makefile.in index dd536ba..71f711e 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.5 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@ @@ -72,6 +89,11 @@ 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=) \ @@ -534,13 +556,10 @@ 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; \ @@ -832,7 +851,7 @@ maintainer-upload-release: _maintainer-upload-release-local _maintainer-upload-release-local: _maintainer-upload-release-check rsync -rvzPp --chmod=Dg+s,ug+rwX,o=rX $(builddir)/docs/reference/html/ \ - telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/doc/telepathy-glib/ + telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/doc/telepathy-glib-0.18.x/ upload-branch-docs: all rsync -rtzvPp --chmod=a+rX docs/reference/html/ \ diff --git a/NEWS b/NEWS index 463d476..26e1dcb 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,34 @@ +telepathy-glib 0.18.1 (2012-04-20) +================================== + +Enhancements: + +• Make various methods of the form get_foo() available to + gobject-introspection (Xavier) + +• Improve stream tube examples (Guillaume) + +• Improve documentation (Xavier) + +Fixes: + +• Change the type of TpStreamTubeConnection::closed's argument from + POINTER to ERROR so PyGI can bind it (Guillaume) + +• Avoid TpCallChannel potentially returning a TpContact with no identifier + (Xavier) + +• Use the right macro to avoid post-2.30 GLib APIs (Guillaume) + +• Fix warnings with newer gtk-doc and g-ir-scanner (fd.o #48592, fd.o #48363, + fd.o #48620; Stef Walter, Alban Browaeys) + +• Make various warnings non-fatal for this stable branch: GIR scanner warnings, + documentation completeness, and deprecated functions (fd.o #48363, Simon) + +• Don't hard-code use of a particular abstract socket in dbus-tube-chan test, + fixing test failure on non-Linux (fd.o #48600, Simon) + telepathy-glib 0.18.0 (2012-04-02) ================================== diff --git a/aclocal.m4 b/aclocal.m4 index 6c51e38..1e3b644 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.5 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, @@ -198,7 +198,7 @@ [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.5], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -214,7 +214,7 @@ # 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.5])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) diff --git a/config.h.in b/config.h.in index 9180d21..1132f18 100644 --- a/config.h.in +++ b/config.h.in @@ -13,7 +13,7 @@ #undef ENABLE_INSTALLED_TESTS /* Prevent post 2.30 APIs */ -#undef GLIB_VERSION_MAX_REQUIRED +#undef GLIB_VERSION_MAX_ALLOWED /* Ignore post 2.30 deprecations */ #undef GLIB_VERSION_MIN_REQUIRED diff --git a/configure b/configure index 11b78eb..6c120f6 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for Telepathy-GLib 0.18.0. +# Generated by GNU Autoconf 2.68 for Telepathy-GLib 0.18.1. # # Report bugs to . # @@ -631,8 +631,8 @@ # Identity of this package. PACKAGE_NAME='Telepathy-GLib' PACKAGE_TARNAME='telepathy-glib' -PACKAGE_VERSION='0.18.0' -PACKAGE_STRING='Telepathy-GLib 0.18.0' +PACKAGE_VERSION='0.18.1' +PACKAGE_STRING='Telepathy-GLib 0.18.1' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=tp-glib' PACKAGE_URL='' @@ -1469,7 +1469,7 @@ # 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 Telepathy-GLib 0.18.0 to adapt to many kinds of systems. +\`configure' configures Telepathy-GLib 0.18.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1539,7 +1539,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Telepathy-GLib 0.18.0:";; + short | recursive ) echo "Configuration of Telepathy-GLib 0.18.1:";; esac cat <<\_ACEOF @@ -1692,7 +1692,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Telepathy-GLib configure 0.18.0 +Telepathy-GLib configure 0.18.1 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2182,7 +2182,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Telepathy-GLib $as_me 0.18.0, which was +It was created by Telepathy-GLib $as_me 0.18.1, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -3000,7 +3000,7 @@ # Define the identity of the package. PACKAGE='telepathy-glib' - VERSION='0.18.0' + VERSION='0.18.1' cat >>confdefs.h <<_ACEOF @@ -12502,7 +12502,7 @@ LT_CURRENT=70 -LT_REVISION=0 +LT_REVISION=1 LT_AGE=70 @@ -12757,7 +12757,8 @@ for tp_flag in missing-field-initializers \ - unused-parameter; do + unused-parameter \ + deprecated-declarations; do { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if compiler understands -Wno-$tp_flag" >&5 $as_echo_n "checking to see if compiler understands -Wno-$tp_flag... " >&6; } @@ -13149,7 +13150,7 @@ $as_echo "#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_30" >>confdefs.h -$as_echo "#define GLIB_VERSION_MAX_REQUIRED GLIB_VERSION_2_30" >>confdefs.h +$as_echo "#define GLIB_VERSION_MAX_ALLOWED GLIB_VERSION_2_30" >>confdefs.h @@ -18147,7 +18148,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Telepathy-GLib $as_me 0.18.0, which was +This file was extended by Telepathy-GLib $as_me 0.18.1, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18213,7 +18214,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Telepathy-GLib config.status 0.18.0 +Telepathy-GLib config.status 0.18.1 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index ecd1b5a..08d463e 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ m4_define([tp_glib_major_version], [0]) m4_define([tp_glib_minor_version], [18]) -m4_define([tp_glib_micro_version], [0]) +m4_define([tp_glib_micro_version], [1]) m4_define([tp_glib_nano_version], [0]) # If library source has changed since last release, increment revision @@ -27,7 +27,7 @@ # never seen in a release). m4_define([tp_glib_lt_current], [70]) -m4_define([tp_glib_lt_revision], [0]) +m4_define([tp_glib_lt_revision], [1]) m4_define([tp_glib_lt_age], [70]) # Some magic @@ -91,7 +91,8 @@ format-security \ init-self], [missing-field-initializers \ - unused-parameter]) + unused-parameter \ + deprecated-declarations]) AC_SUBST([ERROR_CFLAGS]) # these aren't really error flags but they serve a similar purpose for us - @@ -143,14 +144,16 @@ [ENABLE_DOC_CHECKS=$enableval], [ENABLE_DOC_CHECKS=no] ) ], [ # tp-glib is version x.y.z.1 - enable extra checks by default + # (but only partially, because this is a stable branch and gtk-doc's + # definition of "complete" sometimes changes) AC_ARG_ENABLE(coding-style-checks, AC_HELP_STRING([--disable-coding-style-checks], [do not check coding style using grep]), [ENABLE_CODING_STYLE_CHECKS=$enableval], [ENABLE_CODING_STYLE_CHECKS=yes]) AC_ARG_ENABLE(doc-checks, - AC_HELP_STRING([--disable-doc-checks], - [do not check for complete documentation coverage]), - [ENABLE_DOC_CHECKS=$enableval], [ENABLE_DOC_CHECKS=yes]) + AC_HELP_STRING([--enable-doc-checks], + [check for complete documentation coverage]), + [ENABLE_DOC_CHECKS=$enableval], [ENABLE_DOC_CHECKS=no]) ]) AC_SUBST([ENABLE_CODING_STYLE_CHECKS]) @@ -200,7 +203,7 @@ [glib-2.0 >= 2.30.0, gobject-2.0 >= 2.30.0, gio-2.0 >= 2.30.0]) AC_DEFINE([GLIB_VERSION_MIN_REQUIRED], [GLIB_VERSION_2_30], [Ignore post 2.30 deprecations]) -AC_DEFINE([GLIB_VERSION_MAX_REQUIRED], [GLIB_VERSION_2_30], [Prevent post 2.30 APIs]) +AC_DEFINE([GLIB_VERSION_MAX_ALLOWED], [GLIB_VERSION_2_30], [Prevent post 2.30 APIs]) dnl Check for GIO-Unix PKG_CHECK_MODULES(GIO_UNIX, [gio-unix-2.0], diff --git a/docs/Makefile.in b/docs/Makefile.in index 9dfbaa9..0973615 100644 --- a/docs/Makefile.in +++ b/docs/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 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@ @@ -65,6 +82,11 @@ 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=) \ @@ -475,13 +497,10 @@ 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/docs/reference/Makefile.in b/docs/reference/Makefile.in index 01ade45..2dd89d5 100644 --- a/docs/reference/Makefile.in +++ b/docs/reference/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 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@ @@ -65,6 +82,11 @@ 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@ diff --git a/docs/reference/html/TpBaseConnection.html b/docs/reference/html/TpBaseConnection.html index d654144..516486f 100644 --- a/docs/reference/html/TpBaseConnection.html +++ b/docs/reference/html/TpBaseConnection.html @@ -340,7 +340,7 @@ Create an array of channel managers for this Connection. At least one of this or create_channel_factories must be set by subclasses to a non-NULL value. -Since: 0.7.15 +Since 0.7.15 diff --git a/docs/reference/html/index.html b/docs/reference/html/index.html index 6f1efe0..4168efd 100644 --- a/docs/reference/html/index.html +++ b/docs/reference/html/index.html @@ -15,10 +15,12 @@

- This manual documents telepathy-glib version 0.18.0 + This manual documents telepathy-glib version 0.18.1 . The latest development version of this documentation can be found here: online copy of the telepathy-glib API Reference Manual. + The latest version in this stable branch can be found here: + online copy of the telepathy-glib 0.18.x API Reference Manual.

diff --git a/docs/reference/html/index.sgml b/docs/reference/html/index.sgml index ee938c7..eed0459 100644 --- a/docs/reference/html/index.sgml +++ b/docs/reference/html/index.sgml @@ -1,4 +1,5 @@ + diff --git a/docs/reference/html/telepathy-glib-TpPresenceMixin.html b/docs/reference/html/telepathy-glib-TpPresenceMixin.html index a873176..c29009b 100644 --- a/docs/reference/html/telepathy-glib-TpPresenceMixin.html +++ b/docs/reference/html/telepathy-glib-TpPresenceMixin.html @@ -108,7 +108,7 @@

-Implementing SimplePresence

+Implementing SimplePresence

Since 0.7.13 this mixin supports the entire SimplePresence interface. You can implement TpSvcConnectionInterfaceSimplePresence as follows: @@ -160,7 +160,7 @@

-Implementing old-style Presence

+Implementing old-style Presence

This mixin also supports a large subset of the deprecated Presence interface. It does not support protocols where it is possible to set diff --git a/docs/reference/html/telepathy-glib-account-manager.html b/docs/reference/html/telepathy-glib-account-manager.html index 811a22d..c10a5da 100644 --- a/docs/reference/html/telepathy-glib-account-manager.html +++ b/docs/reference/html/telepathy-glib-account-manager.html @@ -186,212 +186,8 @@ - - + + 
1
-2
-3
-4
-5
-6
-7
-8
-9
-10
-11
-12
-13
-14
-15
-16
-17
-18
-19
-20
-21
-22
-23
-24
-25
-26
-27
-28
-29
-30
-31
-32
-33
-34
-35
-36
-37
-38
-39
-40
-41
-42
-43
-44
-45
-46
-47
-48
-49
-50
-51
-52
-53
-54
-55
-56
-57
-58
-59
-60
-61
-62
-63
-64
-65
-66
-67
-68
-69
-70
-71
-72
-73
-74
-75
-76
-77
-78
-79
-80
-81
-82
-83
-84
-85
-86
-87
-88
-89
-90
-91
-92
-93
-94
-95
-96
-97
-98
-99
-100
-101
-102
-103
/*
- * contact-list
- *
- * Copyright © 2011 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * Copying and distribution of this file, with or without modification,
- * are permitted in any medium without royalty provided the copyright
- * notice and this notice are preserved.
- */
-
-#include "config.h"
-
-#include <telepathy-glib/telepathy-glib.h>
-#include <telepathy-glib/debug.h>
-
-static void
-account_manager_prepared_cb (GObject *object,
-    GAsyncResult *res,
-    gpointer user_data)
-{
-  TpAccountManager *manager = (TpAccountManager *) object;
-  GMainLoop *loop = user_data;  
-  GList *accounts;
-  GError *error = NULL;
-
-  if (!tp_proxy_prepare_finish (object, res, &error))
-    {
-      g_print ("Error preparing AM: %s\n", error->message);
-      goto OUT;
-    }
-
-  for (accounts = tp_account_manager_get_valid_accounts (manager);
-       accounts != NULL; accounts = g_list_delete_link (accounts, accounts))
-    {
-      TpAccount *account = accounts->data;
-      TpConnection *connection = tp_account_get_connection (account);
-      GPtrArray *contacts;
-      guint i;
-
-      /* Verify account is online and received its contact list. If state is not
-       * SUCCESS this means we didn't received the roster from server yet and
-       * we would have to wait for the "notify:contact-list-state" signal. */
-      if (connection == NULL ||
-          tp_connection_get_contact_list_state (connection) !=
-              TP_CONTACT_LIST_STATE_SUCCESS)
-        continue;
-
-      contacts = tp_connection_dup_contact_list (connection);
-      for (i = 0; i < contacts->len; i++)
-        {
-          TpContact *contact = g_ptr_array_index (contacts, i);
-          const gchar * const *groups;
-
-          g_print ("contact %s (%s) in groups:\n",
-              tp_contact_get_identifier (contact),
-              tp_contact_get_alias (contact));
-
-          for (groups = tp_contact_get_contact_groups (contact);
-               *groups != NULL; groups++)
-            g_print ("  %s\n", *groups);
-        }
-      g_ptr_array_unref (contacts);
-    }
-
-OUT:
-  g_main_loop_quit (loop);
-}
-
-int
-main (int argc,
-      char **argv)
-{
-  TpAccountManager *manager;
-  TpSimpleClientFactory *factory;
-  GMainLoop *loop;
-
-  g_type_init ();
-  tp_debug_set_flags (g_getenv ("EXAMPLE_DEBUG"));
-
-  loop = g_main_loop_new (NULL, FALSE);
-
-  manager = tp_account_manager_dup ();
-  factory = tp_proxy_get_factory (manager);
-  tp_simple_client_factory_add_account_features_varargs (factory,
-      TP_ACCOUNT_FEATURE_CONNECTION,
-      0);
-  tp_simple_client_factory_add_connection_features_varargs (factory,
-      TP_CONNECTION_FEATURE_CONTACT_LIST,
-      0);
-  tp_simple_client_factory_add_contact_features_varargs (factory,
-      TP_CONTACT_FEATURE_ALIAS,
-      TP_CONTACT_FEATURE_CONTACT_GROUPS,
-      TP_CONTACT_FEATURE_INVALID);
-
-  tp_proxy_prepare_async (manager, NULL, account_manager_prepared_cb, loop);
-
-  g_main_loop_run (loop);
-
-  g_object_unref (manager);
-  g_main_loop_unref (loop);
-
-  return 0;
-}
1
FIXME: MISSING XINCLUDE CONTENT
@@ -497,6 +293,10 @@ which use a custom TpSimpleClientFactory and want the default TpAccountManager to use that factory should call this after calling tp_account_manager_new_with_factory(). +

+

+Unlike tp_account_manager_dup(), this function will keep an internal +reference to manager, so it will never be destroyed.

Note that manager must use the default TpDBusDaemon as returned by diff --git a/docs/reference/html/telepathy-glib-asv.html b/docs/reference/html/telepathy-glib-asv.html index 4478a52..2c64a01 100644 --- a/docs/reference/html/telepathy-glib-asv.html +++ b/docs/reference/html/telepathy-glib-asv.html @@ -234,7 +234,7 @@

-

Example 1. Using tp_asv_new()

+

Example 1. Using tp_asv_new()

diff --git a/docs/reference/html/telepathy-glib-channel-dispatch-operation.html b/docs/reference/html/telepathy-glib-channel-dispatch-operation.html index 147d35c..5d782c7 100644 --- a/docs/reference/html/telepathy-glib-channel-dispatch-operation.html +++ b/docs/reference/html/telepathy-glib-channel-dispatch-operation.html @@ -1156,12 +1156,12 @@

If an X server timestamp for the user action causing this method call is available, user_action_time should be this timestamp (for instance, the -result of gdk_event_get_time() if it is not GDK_CURRENT_TIME). Otherwise, it +result of gdk_event_get_time() if it is not GDK_CURRENT_TIME). Otherwise, it may be TP_USER_ACTION_TIME_NOT_USER_ACTION to behave as if there was no user action or it happened a long time ago, or TP_USER_ACTION_TIME_CURRENT_TIME to have the Handler behave as though the user action had just happened (resembling, but not numerically equal to, -GDK_CURRENT_TIME). +GDK_CURRENT_TIME).

This method has been introduced in telepathy-mission-control 5.5.0. diff --git a/docs/reference/html/telepathy-glib-dbus-properties-mixin.html b/docs/reference/html/telepathy-glib-dbus-properties-mixin.html index af1f3d9..394d423 100644 --- a/docs/reference/html/telepathy-glib-dbus-properties-mixin.html +++ b/docs/reference/html/telepathy-glib-dbus-properties-mixin.html @@ -1088,7 +1088,7 @@

- diff --git a/docs/reference/html/telepathy-glib-defs.html b/docs/reference/html/telepathy-glib-defs.html index 773b91c..d508718 100644 --- a/docs/reference/html/telepathy-glib-defs.html +++ b/docs/reference/html/telepathy-glib-defs.html @@ -199,7 +199,7 @@ The "user action time" used by methods like tp_account_channel_request_new() to represent channel requests that should be treated as though they happened at the current time. This is the same -concept as GDK_CURRENT_TIME in Gdk (but note that the numerical value used +concept as GDK_CURRENT_TIME in Gdk (but note that the numerical value used in Telepathy is not the same).

diff --git a/docs/reference/html/telepathy-glib-errors.html b/docs/reference/html/telepathy-glib-errors.html index 5858dd0..3d3a33f 100644 --- a/docs/reference/html/telepathy-glib-errors.html +++ b/docs/reference/html/telepathy-glib-errors.html @@ -514,7 +514,7 @@

@@ -522,7 +522,7 @@ @@ -531,7 +531,7 @@ Raised if the length in bytes of the server certificate, or the depth of the server certificate chain, exceed the limits imposed by the crypto library. - Since: 0.11.12 + Since 0.11.12 @@ -539,7 +539,7 @@ @@ -547,7 +547,7 @@ @@ -555,7 +555,7 @@ @@ -566,7 +566,7 @@ understand each other, or an apparently impossible situation is reached. This has a similar meaning to TP_DBUS_ERROR_INCONSISTENT but can be passed between processes via D-Bus. - Since: 0.13.7 + Since 0.13.7 @@ -575,7 +575,7 @@ Raised when a server or other piece of infrastructure indicates an internal error, or when a message that makes no sense is received from a server or other piece of infrastructure. - Since: 0.13.7 + Since 0.13.7 @@ -608,7 +608,7 @@ @@ -616,7 +616,7 @@ @@ -624,7 +624,7 @@ diff --git a/docs/reference/html/telepathy-glib-stream-tube-connection.html b/docs/reference/html/telepathy-glib-stream-tube-connection.html index 050a973..0c92bdc 100644 --- a/docs/reference/html/telepathy-glib-stream-tube-connection.html +++ b/docs/reference/html/telepathy-glib-stream-tube-connection.html @@ -225,7 +225,7 @@

The "closed" signal

void                user_function                      (TpStreamTubeConnection *self,
-                                                        gpointer                error,
+                                                        GError                 *error,
                                                         gpointer                user_data)      : Run Last

The ::closed signal is emitted when the connection manager reports that diff --git a/docs/reference/html/telepathy-glib-util.html b/docs/reference/html/telepathy-glib-util.html index 44c2609..db9894c 100644 --- a/docs/reference/html/telepathy-glib-util.html +++ b/docs/reference/html/telepathy-glib-util.html @@ -1122,7 +1122,7 @@

-

Example 3.  using tp_value_array_build

+

Example 3.  using tp_value_array_build

... :

(unqualified) property names whose values have changed, terminated by +unqualified property names whose values have changed, terminated by NULL.
org.freedesktop.Telepathy.Error.Cert.Revoked: Raised if the server provided an SSL/TLS certificate that has been revoked. - Since: 0.11.12 + Since 0.11.12
org.freedesktop.Telepathy.Error.Cert.Insecure: Raised if the server provided an SSL/TLS certificate that uses an insecure cipher algorithm or is cryptographically weak. - Since: 0.11.12 + Since 0.11.12
org.freedesktop.Telepathy.Error.NotYet: Raised when the requested functionality is not yet available, but is likely to become available after some time has passed. - Since: 0.11.15 + Since 0.11.15
org.freedesktop.Telepathy.Error.Rejected: Raised when an incoming or outgoing call is rejected by the receiving contact. - Since: 0.13.2 + Since 0.13.2
org.freedesktop.Telepathy.Error.PickedUpElsewhere: Raised when a call was terminated as a result of the local user picking up the call on a different resource. - Since: 0.13.3 + Since 0.13.3
org.freedesktop.Telepathy.Error.Media.CodecsIncompatible: Raised when the local streaming implementation has no codecs in common with the remote side. - Since: 0.15.6 + Since 0.15.6
org.freedesktop.Telepathy.Error.Media.UnsupportedType: The media stream type requested is not supported by either the local or remote side. - Since: 0.15.6 + Since 0.15.6
org.freedesktop.Telepathy.Error.Media.StreamingError: Raised when the call's streaming implementation has some kind of internal error. - Since: 0.15.6 + Since 0.15.6
@@ -1183,7 +1183,7 @@

-

Example 4. using tp_value_array_unpack

+

Example 4. using tp_value_array_unpack

@@ -1565,7 +1565,7 @@

Interpret a Telepathy user action time to decide whether a Handler should attempt to gain focus. If TRUE is returned, it would be appropriate to -call gtk_window_present_with_time() using x11_time as input, for instance. +call gtk_window_present_with_time() using x11_time as input, for instance.

x11_time is used to return a timestamp in the right format for X11, diff --git a/docs/reference/telepathy-glib-docs.sgml b/docs/reference/telepathy-glib-docs.sgml index 7918bb1..3d6931f 100644 --- a/docs/reference/telepathy-glib-docs.sgml +++ b/docs/reference/telepathy-glib-docs.sgml @@ -10,6 +10,8 @@ This manual documents telepathy-glib version &tpglibversion;. The latest development version of this documentation can be found here: online copy of the telepathy-glib API Reference Manual. + The latest version in this stable branch can be found here: + online copy of the telepathy-glib 0.18.x API Reference Manual. diff --git a/docs/reference/version.xml b/docs/reference/version.xml index 6633391..249afd5 100644 --- a/docs/reference/version.xml +++ b/docs/reference/version.xml @@ -1 +1 @@ -0.18.0 +0.18.1 diff --git a/examples/Makefile.in b/examples/Makefile.in index 5429706..de876c6 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.5 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@ @@ -65,6 +82,11 @@ 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=) \ @@ -478,13 +500,10 @@ 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/examples/client/Makefile.in b/examples/client/Makefile.in index ac7939f..3cf93cb 100644 --- a/examples/client/Makefile.in +++ b/examples/client/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 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@ @@ -210,6 +227,11 @@ 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=) \ @@ -495,8 +517,11 @@ $(am__aclocal_m4_deps): install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; 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 echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p || test -f $$p1; \ @@ -791,13 +816,10 @@ 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/examples/client/dbus-tubes/Makefile.in b/examples/client/dbus-tubes/Makefile.in index c5c15cc..6154b9f 100644 --- a/examples/client/dbus-tubes/Makefile.in +++ b/examples/client/dbus-tubes/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 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@ @@ -94,6 +111,11 @@ am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(accepter_SOURCES) $(offerer_SOURCES) DIST_SOURCES = $(accepter_SOURCES) $(offerer_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) diff --git a/examples/client/js/Makefile.in b/examples/client/js/Makefile.in index 6defe9a..125bc8f 100644 --- a/examples/client/js/Makefile.in +++ b/examples/client/js/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 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@ @@ -58,6 +75,11 @@ 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@ diff --git a/examples/client/python/Makefile.am b/examples/client/python/Makefile.am index 9405455..1d35979 100644 --- a/examples/client/python/Makefile.am +++ b/examples/client/python/Makefile.am @@ -4,4 +4,6 @@ inspect-cm.py \ text-handler.py \ file-transfer.py \ - ft-handler.py + ft-handler.py \ + stream-tubes.py/offerer.py \ + stream-tubes.py/accepter.py diff --git a/examples/client/python/Makefile.in b/examples/client/python/Makefile.in index ad9a24e..55f0a9f 100644 --- a/examples/client/python/Makefile.in +++ b/examples/client/python/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 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@ @@ -58,6 +75,11 @@ 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@ @@ -233,7 +255,9 @@ inspect-cm.py \ text-handler.py \ file-transfer.py \ - ft-handler.py + ft-handler.py \ + stream-tubes.py/offerer.py \ + stream-tubes.py/accepter.py all: all-am diff --git a/examples/client/python/stream-tubes.py/accepter.py b/examples/client/python/stream-tubes.py/accepter.py new file mode 100755 index 0000000..0720ae7 --- /dev/null +++ b/examples/client/python/stream-tubes.py/accepter.py @@ -0,0 +1,73 @@ +#!/usr/bin/env python + +import os + +from gi.repository import GObject, Gio +from gi.repository import TelepathyGLib as Tp + +def tube_conn_closed(tube, error): + print "Tube connection has been closed", error.message + +def tube_accept_cb(tube, result, loop): + try: + tube_conn = tube.accept_finish(result) + except GObject.GError, e: + print "Failed to accept tube: %s" % e + sys.exit(1) + + tube_conn.connect('closed', tube_conn_closed) + + contact = tube_conn.get_contact(); + + print "Got IOStream to", contact.get_identifier() + + conn = tube_conn.get_socket_connection(); + + # g_input_stream_read() can't be used from Python so we use the more + # binding friendly GDataInputStream + in_stream = Gio.DataInputStream (base_stream=conn.get_input_stream()) + out_stream = conn.get_output_stream() + + print "Sending: Ping" + out_stream.write("Ping\n", None) + + buf, len = in_stream.read_line_utf8(None) + print "Received:", buf + +def tube_invalidated_cb(tube, domain, code, message, loop): + print "tube has been invalidated:", message + loop.quit() + +def handle_channels_cb(handler, account, connection, channels, requests, + user_action_time, context, loop): + for channel in channels: + if not isinstance(channel, Tp.StreamTubeChannel): + continue + + print "Accepting tube" + + channel.connect('invalidated', tube_invalidated_cb, loop) + + channel.accept_async(tube_accept_cb, loop) + + context.accept() + +if __name__ == '__main__': + Tp.debug_set_flags(os.getenv('EXAMPLE_DEBUG', '')) + + loop = GObject.MainLoop() + + account_manager = Tp.AccountManager.dup() + handler = Tp.SimpleHandler.new_with_am(account_manager, False, False, + 'ExampleServiceHandler', False, handle_channels_cb, loop) + + handler.add_handler_filter({ + Tp.PROP_CHANNEL_CHANNEL_TYPE: Tp.IFACE_CHANNEL_TYPE_STREAM_TUBE, + Tp.PROP_CHANNEL_TARGET_HANDLE_TYPE: int(Tp.HandleType.CONTACT), + Tp.PROP_CHANNEL_TYPE_STREAM_TUBE_SERVICE: "ExampleService", + }) + + handler.register() + + print "Waiting for tube offer" + loop.run() diff --git a/examples/client/python/stream-tubes.py/offerer.py b/examples/client/python/stream-tubes.py/offerer.py new file mode 100755 index 0000000..1f4309d --- /dev/null +++ b/examples/client/python/stream-tubes.py/offerer.py @@ -0,0 +1,104 @@ +#!/usr/bin/env python + +import sys +import os + +from gi.repository import GObject, Gio +from gi.repository import TelepathyGLib as Tp + +def usage(): + print "%s ACCOUNT CONTACT" % sys.argv[0] + print "ACCOUNT is a Telepathy account name, use 'mc-tool list' to list all your accounts" + print "CONTACT is a contact id such as badger@nyan.cat" + + sys.exit(1) + +def offer_channel_cb(tube, result, loop): + try: + tube.offer_finish(result) + print "tube offered" + + except GObject.GError, e: + print "Failed to offer tube: %s" % e + sys.exit(1) + +def tube_conn_closed(tube, error): + print "Tube connection has been closed", error.message + +def channel_close_cb(tube, result, loop): + try: + tube.close_finish(result) + print "tube channel closed" + + except GObject.GError, e: + print "Failed to close tube channel: %s" % e + sys.exit(1) + +def tube_incoming_cb(tube, tube_conn, loop): + tube_conn.connect('closed', tube_conn_closed) + + contact = tube_conn.get_contact(); + + print "Got IOStream from", contact.get_identifier() + + conn = tube_conn.get_socket_connection(); + + # g_input_stream_read() can't be used from Python so we use the more + # binding friendly GDataInputStream + in_stream = Gio.DataInputStream (base_stream=conn.get_input_stream()) + out_stream = conn.get_output_stream() + + buf, len = in_stream.read_line_utf8(None) + print "Received:", buf + + print "Sending: Pong" + out_stream.write("Pong\n", None) + + tube.close_async(channel_close_cb, contact) + +def tube_invalidated_cb(tube, domain, code, message, loop): + print "tube has been invalidated:", message + loop.quit() + +def create_channel_cb(request, result, loop): + try: + (chan, context) = request.create_and_handle_channel_finish(result) + + chan.connect('incoming', tube_incoming_cb, loop) + chan.connect('invalidated', tube_invalidated_cb, loop) + + chan.offer_async({}, offer_channel_cb, loop) + + except GObject.GError, e: + print "Failed to create channel: %s" % e + sys.exit(1) + +if __name__ == '__main__': + Tp.debug_set_flags(os.getenv('EXAMPLE_DEBUG', '')) + + if len(sys.argv) != 3: + usage() + + _, account_id, contact_id = sys.argv + + account_manager = Tp.AccountManager.dup() + account = account_manager.ensure_account("%s%s" % + (Tp.ACCOUNT_OBJECT_PATH_BASE, account_id)) + + request_dict = { + Tp.PROP_CHANNEL_CHANNEL_TYPE: + Tp.IFACE_CHANNEL_TYPE_STREAM_TUBE, + Tp.PROP_CHANNEL_TARGET_HANDLE_TYPE: + int(Tp.HandleType.CONTACT), + Tp.PROP_CHANNEL_TARGET_ID: + contact_id, + + Tp.PROP_CHANNEL_TYPE_STREAM_TUBE_SERVICE: "ExampleService", + } + + request = Tp.AccountChannelRequest.new(account, request_dict, 0) + + loop = GObject.MainLoop() + request.create_and_handle_channel_async(None, create_channel_cb, loop) + + loop.run() diff --git a/examples/client/stream-tubes/Makefile.in b/examples/client/stream-tubes/Makefile.in index c2aae5b..287cfe9 100644 --- a/examples/client/stream-tubes/Makefile.in +++ b/examples/client/stream-tubes/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 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@ @@ -94,6 +111,11 @@ am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(accepter_SOURCES) $(offerer_SOURCES) DIST_SOURCES = $(accepter_SOURCES) $(offerer_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) diff --git a/examples/client/stream-tubes/accepter.c b/examples/client/stream-tubes/accepter.c index 8f6e580..41d7652 100644 --- a/examples/client/stream-tubes/accepter.c +++ b/examples/client/stream-tubes/accepter.c @@ -48,13 +48,14 @@ out = g_io_stream_get_output_stream (G_IO_STREAM (conn)); /* this bit is not a good example */ - g_output_stream_write (out, "Ping", 4, NULL, &error); + g_debug ("Sending: Ping"); + g_output_stream_write (out, "Ping\n", 5, NULL, &error); g_assert_no_error (error); g_input_stream_read (in, &buf, sizeof (buf), NULL, &error); g_assert_no_error (error); - g_debug ("Sent Ping got: %s", buf); + g_debug ("Received: %s", buf); g_object_unref (tube_conn); g_object_unref (tube); diff --git a/examples/client/stream-tubes/offerer.c b/examples/client/stream-tubes/offerer.c index 3b6535a..3ba0106 100644 --- a/examples/client/stream-tubes/offerer.c +++ b/examples/client/stream-tubes/offerer.c @@ -3,11 +3,20 @@ static GMainLoop *loop = NULL; static void -channel_closed_cb (TpChannel *channel, - const GError *error, - gpointer user_data, - GObject *weak_object) +channel_closed_cb (GObject *object, + GAsyncResult *result, + gpointer user_data) { + TpChannel *channel = TP_CHANNEL (object); + GError *error = NULL; + + if (!tp_channel_close_finish (channel, result, &error)) + { + g_debug ("Failed to close tube channel: %s", error->message); + g_error_free (error); + return; + } + g_debug ("Tube channel closed"); } @@ -45,16 +54,15 @@ out = g_io_stream_get_output_stream (G_IO_STREAM (conn)); /* this bit is not a good example */ - g_output_stream_write (out, "Pong", 4, NULL, &error); + g_input_stream_read (in, &buf, sizeof (buf), NULL, &error); + g_assert_no_error (error); + g_debug ("Received: %s", buf); + + g_debug ("Sending: Pong"); + g_output_stream_write (out, "Pong\n", 5, NULL, &error); g_assert_no_error (error); - g_input_stream_read (in, &buf, sizeof (buf), NULL, &error); - g_assert_no_error (error); - - g_debug ("Send Pong got: %s", buf); - - tp_cli_channel_call_close (TP_CHANNEL (tube), -1, channel_closed_cb, - NULL, NULL, NULL); + tp_channel_close_async (TP_CHANNEL (tube), channel_closed_cb, NULL); g_object_unref (tube); } diff --git a/examples/cm/Makefile.in b/examples/cm/Makefile.in index 74b777d..316f165 100644 --- a/examples/cm/Makefile.in +++ b/examples/cm/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 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@ @@ -65,6 +82,11 @@ 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=) \ @@ -482,13 +504,10 @@ 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/examples/cm/call/Makefile.in b/examples/cm/call/Makefile.in index 846b5a3..d46fee0 100644 --- a/examples/cm/call/Makefile.in +++ b/examples/cm/call/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -20,6 +20,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@ @@ -108,6 +125,11 @@ $(telepathy_example_cm_call_SOURCES) DIST_SOURCES = $(libexample_cm_call_la_SOURCES) \ $(telepathy_example_cm_call_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__dist_manager_DATA_DIST = example_call.manager am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ @@ -408,8 +430,11 @@ $(AM_V_CCLD)$(LINK) $(libexample_cm_call_la_OBJECTS) $(libexample_cm_call_la_LIBADD) $(LIBS) install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p || test -f $$p1; \ @@ -505,8 +530,11 @@ -rm -rf .libs _libs install-dist_managerDATA: $(dist_manager_DATA) @$(NORMAL_INSTALL) - test -z "$(managerdir)" || $(MKDIR_P) "$(DESTDIR)$(managerdir)" @list='$(dist_manager_DATA)'; test -n "$(managerdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(managerdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(managerdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -523,8 +551,11 @@ dir='$(DESTDIR)$(managerdir)'; $(am__uninstall_files_from_dir) install-serviceDATA: $(service_DATA) @$(NORMAL_INSTALL) - test -z "$(servicedir)" || $(MKDIR_P) "$(DESTDIR)$(servicedir)" @list='$(service_DATA)'; test -n "$(servicedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(servicedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(servicedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff --git a/examples/cm/channelspecific/Makefile.in b/examples/cm/channelspecific/Makefile.in index 4c17658..82074d3 100644 --- a/examples/cm/channelspecific/Makefile.in +++ b/examples/cm/channelspecific/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -21,6 +21,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@ @@ -109,6 +126,11 @@ $(telepathy_example_cm_csh_SOURCES) DIST_SOURCES = $(libexample_cm_csh_la_SOURCES) \ $(telepathy_example_cm_csh_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__dist_manager_DATA_DIST = example_csh.manager am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ @@ -405,8 +427,11 @@ $(AM_V_CCLD)$(LINK) $(libexample_cm_csh_la_OBJECTS) $(libexample_cm_csh_la_LIBADD) $(LIBS) install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p || test -f $$p1; \ @@ -500,8 +525,11 @@ -rm -rf .libs _libs install-dist_managerDATA: $(dist_manager_DATA) @$(NORMAL_INSTALL) - test -z "$(managerdir)" || $(MKDIR_P) "$(DESTDIR)$(managerdir)" @list='$(dist_manager_DATA)'; test -n "$(managerdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(managerdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(managerdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -518,8 +546,11 @@ dir='$(DESTDIR)$(managerdir)'; $(am__uninstall_files_from_dir) install-serviceDATA: $(service_DATA) @$(NORMAL_INSTALL) - test -z "$(servicedir)" || $(MKDIR_P) "$(DESTDIR)$(servicedir)" @list='$(service_DATA)'; test -n "$(servicedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(servicedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(servicedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff --git a/examples/cm/contactlist/Makefile.in b/examples/cm/contactlist/Makefile.in index 0869296..96133e4 100644 --- a/examples/cm/contactlist/Makefile.in +++ b/examples/cm/contactlist/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -20,6 +20,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@ @@ -109,6 +126,11 @@ $(telepathy_example_cm_contactlist_SOURCES) DIST_SOURCES = $(libexample_cm_contactlist_la_SOURCES) \ $(telepathy_example_cm_contactlist_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__dist_manager_DATA_DIST = example_contact_list.manager am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ @@ -399,8 +421,11 @@ $(AM_V_CCLD)$(LINK) $(libexample_cm_contactlist_la_OBJECTS) $(libexample_cm_contactlist_la_LIBADD) $(LIBS) install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p || test -f $$p1; \ @@ -493,8 +518,11 @@ -rm -rf .libs _libs install-dist_managerDATA: $(dist_manager_DATA) @$(NORMAL_INSTALL) - test -z "$(managerdir)" || $(MKDIR_P) "$(DESTDIR)$(managerdir)" @list='$(dist_manager_DATA)'; test -n "$(managerdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(managerdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(managerdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -511,8 +539,11 @@ dir='$(DESTDIR)$(managerdir)'; $(am__uninstall_files_from_dir) install-serviceDATA: $(service_DATA) @$(NORMAL_INSTALL) - test -z "$(servicedir)" || $(MKDIR_P) "$(DESTDIR)$(servicedir)" @list='$(service_DATA)'; test -n "$(servicedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(servicedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(servicedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff --git a/examples/cm/echo-message-parts/Makefile.in b/examples/cm/echo-message-parts/Makefile.in index 1d2d9b7..bfa7a95 100644 --- a/examples/cm/echo-message-parts/Makefile.in +++ b/examples/cm/echo-message-parts/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 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@ @@ -107,6 +124,11 @@ $(telepathy_example_cm_echo_2_SOURCES) DIST_SOURCES = $(libexample_cm_echo_2_la_SOURCES) \ $(telepathy_example_cm_echo_2_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__dist_manager_DATA_DIST = example_echo_2.manager am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ @@ -403,8 +425,11 @@ $(AM_V_CCLD)$(LINK) $(libexample_cm_echo_2_la_OBJECTS) $(libexample_cm_echo_2_la_LIBADD) $(LIBS) install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p || test -f $$p1; \ @@ -498,8 +523,11 @@ -rm -rf .libs _libs install-dist_managerDATA: $(dist_manager_DATA) @$(NORMAL_INSTALL) - test -z "$(managerdir)" || $(MKDIR_P) "$(DESTDIR)$(managerdir)" @list='$(dist_manager_DATA)'; test -n "$(managerdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(managerdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(managerdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -516,8 +544,11 @@ dir='$(DESTDIR)$(managerdir)'; $(am__uninstall_files_from_dir) install-serviceDATA: $(service_DATA) @$(NORMAL_INSTALL) - test -z "$(servicedir)" || $(MKDIR_P) "$(DESTDIR)$(servicedir)" @list='$(service_DATA)'; test -n "$(servicedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(servicedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(servicedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff --git a/examples/cm/extended/Makefile.in b/examples/cm/extended/Makefile.in index 82fca1c..a43e0bd 100644 --- a/examples/cm/extended/Makefile.in +++ b/examples/cm/extended/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,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@ @@ -100,6 +117,11 @@ am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(telepathy_example_cm_extended_SOURCES) DIST_SOURCES = $(telepathy_example_cm_extended_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__dist_manager_DATA_DIST = example_extended.manager am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ @@ -375,8 +397,11 @@ $(am__aclocal_m4_deps): install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p || test -f $$p1; \ @@ -468,8 +493,11 @@ -rm -rf .libs _libs install-dist_managerDATA: $(dist_manager_DATA) @$(NORMAL_INSTALL) - test -z "$(managerdir)" || $(MKDIR_P) "$(DESTDIR)$(managerdir)" @list='$(dist_manager_DATA)'; test -n "$(managerdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(managerdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(managerdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -486,8 +514,11 @@ dir='$(DESTDIR)$(managerdir)'; $(am__uninstall_files_from_dir) install-serviceDATA: $(service_DATA) @$(NORMAL_INSTALL) - test -z "$(servicedir)" || $(MKDIR_P) "$(DESTDIR)$(servicedir)" @list='$(service_DATA)'; test -n "$(servicedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(servicedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(servicedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff --git a/examples/cm/no-protocols/Makefile.in b/examples/cm/no-protocols/Makefile.in index 96a4a94..cdb36fa 100644 --- a/examples/cm/no-protocols/Makefile.in +++ b/examples/cm/no-protocols/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,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@ @@ -99,6 +116,11 @@ am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(telepathy_example_no_protocols_SOURCES) DIST_SOURCES = $(telepathy_example_no_protocols_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__dist_manager_DATA_DIST = example_no_protocols.manager am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ @@ -369,8 +391,11 @@ $(am__aclocal_m4_deps): install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p || test -f $$p1; \ @@ -460,8 +485,11 @@ -rm -rf .libs _libs install-dist_managerDATA: $(dist_manager_DATA) @$(NORMAL_INSTALL) - test -z "$(managerdir)" || $(MKDIR_P) "$(DESTDIR)$(managerdir)" @list='$(dist_manager_DATA)'; test -n "$(managerdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(managerdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(managerdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -478,8 +506,11 @@ dir='$(DESTDIR)$(managerdir)'; $(am__uninstall_files_from_dir) install-serviceDATA: $(service_DATA) @$(NORMAL_INSTALL) - test -z "$(servicedir)" || $(MKDIR_P) "$(DESTDIR)$(servicedir)" @list='$(service_DATA)'; test -n "$(servicedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(servicedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(servicedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff --git a/examples/extensions/Makefile.in b/examples/extensions/Makefile.in index b691afa..caed146 100644 --- a/examples/extensions/Makefile.in +++ b/examples/extensions/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -25,6 +25,23 @@ # that will work on TpProxy or any subclass of TpProxy. 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@ @@ -102,6 +119,11 @@ SOURCES = $(libexample_extensions_la_SOURCES) \ $(nodist_libexample_extensions_la_SOURCES) DIST_SOURCES = $(libexample_extensions_la_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) diff --git a/m4/Makefile.in b/m4/Makefile.in index f730d4c..19fbee7 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 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@ @@ -58,6 +75,11 @@ 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@ diff --git a/spec/Makefile.in b/spec/Makefile.in index 96cf9c5..5ea59d1 100644 --- a/spec/Makefile.in +++ b/spec/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 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@ @@ -58,6 +75,11 @@ 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@ diff --git a/telepathy-glib/Makefile.in b/telepathy-glib/Makefile.in index 5f5c459..59ac247 100644 --- a/telepathy-glib/Makefile.in +++ b/telepathy-glib/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -24,6 +24,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@ @@ -198,6 +215,11 @@ $(nodist_libtelepathy_glib_internal_la_SOURCES) \ $(nodist_libtelepathy_glib_la_SOURCES) DIST_SOURCES = $(libtelepathy_glib_internal_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__dist_gir_DATA_DIST = TelepathyGLib-0.12.gir DATA = $(dist_gir_DATA) $(pkgconfig_DATA) $(typelibs_DATA) HEADERS = $(nodist_geninclude_HEADERS) $(tpginclude_HEADERS) @@ -967,8 +989,6 @@ @HAVE_INTROSPECTION_TRUE@ _gen/telepathy-interfaces.h \ @HAVE_INTROSPECTION_TRUE@ $(NULL) -@HAVE_INTROSPECTION_TRUE@@OFFICIAL_RELEASE_FALSE@SCANNER_WARN_ERROR = --warn-error -@HAVE_INTROSPECTION_TRUE@@OFFICIAL_RELEASE_TRUE@SCANNER_WARN_ERROR = @HAVE_INTROSPECTION_TRUE@TelepathyGLib_0_12_gir_NAMESPACE = TelepathyGLib @HAVE_INTROSPECTION_TRUE@TelepathyGLib_0_12_gir_VERSION = 0.12 @HAVE_INTROSPECTION_TRUE@TelepathyGLib_0_12_gir_LIBS = libtelepathy-glib.la @@ -979,7 +999,6 @@ @HAVE_INTROSPECTION_TRUE@ -I$(top_srcdir) \ @HAVE_INTROSPECTION_TRUE@ --c-include="telepathy-glib/telepathy-glib.h" \ @HAVE_INTROSPECTION_TRUE@ --warn-all \ -@HAVE_INTROSPECTION_TRUE@ $(SCANNER_WARN_ERROR) \ @HAVE_INTROSPECTION_TRUE@ $(NULL) @HAVE_INTROSPECTION_TRUE@TelepathyGLib_0_12_gir_INCLUDES = \ @@ -1038,7 +1057,6 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ 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 \ @@ -1046,6 +1064,8 @@ 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)"; \ } @@ -1382,8 +1402,11 @@ -rm -rf .libs _libs install-dist_girDATA: $(dist_gir_DATA) @$(NORMAL_INSTALL) - test -z "$(girdir)" || $(MKDIR_P) "$(DESTDIR)$(girdir)" @list='$(dist_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"; \ @@ -1400,8 +1423,11 @@ dir='$(DESTDIR)$(girdir)'; $(am__uninstall_files_from_dir) 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"; \ @@ -1418,8 +1444,11 @@ dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) install-typelibsDATA: $(typelibs_DATA) @$(NORMAL_INSTALL) - test -z "$(typelibsdir)" || $(MKDIR_P) "$(DESTDIR)$(typelibsdir)" @list='$(typelibs_DATA)'; test -n "$(typelibsdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(typelibsdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(typelibsdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -1436,8 +1465,11 @@ dir='$(DESTDIR)$(typelibsdir)'; $(am__uninstall_files_from_dir) install-nodist_genincludeHEADERS: $(nodist_geninclude_HEADERS) @$(NORMAL_INSTALL) - test -z "$(genincludedir)" || $(MKDIR_P) "$(DESTDIR)$(genincludedir)" @list='$(nodist_geninclude_HEADERS)'; test -n "$(genincludedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(genincludedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(genincludedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -1454,8 +1486,11 @@ dir='$(DESTDIR)$(genincludedir)'; $(am__uninstall_files_from_dir) install-tpgincludeHEADERS: $(tpginclude_HEADERS) @$(NORMAL_INSTALL) - test -z "$(tpgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(tpgincludedir)" @list='$(tpginclude_HEADERS)'; test -n "$(tpgincludedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(tpgincludedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(tpgincludedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff --git a/telepathy-glib/TelepathyGLib-0.12.gir b/telepathy-glib/TelepathyGLib-0.12.gir index adbdc4f..c22c43e 100644 --- a/telepathy-glib/TelepathyGLib-0.12.gir +++ b/telepathy-glib/TelepathyGLib-0.12.gir @@ -55,6 +55,9 @@ + <![CDATA[ A type for communication access control. These control policies are used in CommunicationPolicy.DRAFT as well as most rich presence interfaces. New interfaces should use this type, and NOT Rich_Presence_Access_Control_Type. ]]> + +Bitfield/set of flags generated from the Telepathy specification. @@ -3326,6 +3329,9 @@ which use a custom #TpSimpleClientFactory and want the default #TpAccountManager to use that factory should call this after calling tp_account_manager_new_with_factory(). + +Unlike tp_account_manager_dup(), this function will keep an internal +reference to @manager, so it will never be destroyed. Note that @manager must use the default #TpDBusDaemon as returned by tp_dbus_daemon_dup() @@ -3570,6 +3576,9 @@ disguised="1"> + <![CDATA[ Flags for the various types of anonymity modes. These modes are solely to inform the CM of the desired anonymous settings. It is up to the CM to determine whether the anonymity modes should be handled within the CM itself, or whether the network that a CM might be talking to should be enforcing anonymity. CMs MAY support only a subset of these modes, and specific connections MAY support none at all. ]]> + +Bitfield/set of flags generated from the Telepathy specification. @@ -4286,8 +4295,7 @@ + version="0.11.11"> Return the #TpBaseClient:dbus-daemon construct-only property, which represents the D-Bus connection used to export this client object. @@ -4314,8 +4322,7 @@ + version="0.11.11"> Return the #TpBaseClient:name construct-only property, which is used as part of the bus name and object path. @@ -4351,8 +4358,7 @@ + version="0.11.11"> Return the #TpBaseClient:uniquify-name construct-only property; if this is true, the bus name and object path will be made unique by appending a suffix that includes the D-Bus unique name and a per-process counter. @@ -6755,6 +6761,9 @@ + <![CDATA[ The disposition of this content, which defines whether to automatically start sending data on the streams when Accept is called on the channel. ]]> + +Bitfield/set of flags generated from the Telepathy specification. @@ -6764,6 +6773,9 @@ + <![CDATA[ A packetization method that can be used for a content. ]]> + +Bitfield/set of flags generated from the Telepathy specification. @@ -6779,6 +6791,9 @@ disguised="1"> + <![CDATA[ A set of flags representing additional information than is available in CallState. Many of these flags only make sense in a particular (or may explain why a call is in a specific state). ]]> + +Bitfield/set of flags generated from the Telepathy specification. @@ -6794,6 +6809,9 @@ + <![CDATA[ A set of flags representing the status of a remote contact in a call. It is protocol- and client-specific whether a particular contact will ever have a particular flag set on them, and Telepathy clients SHOULD NOT assume that a flag will ever be set. 180 Ringing in SIP, and its equivalent in XMPP, are optional informational messages, and implementations are not required to send them. The same applies to the messages used to indicate hold state. ]]> + +Bitfield/set of flags generated from the Telepathy specification. @@ -6803,6 +6821,9 @@ c:identifier="TP_CALL_MEMBER_FLAG_CONFERENCE_HOST"/> + <![CDATA[ The state of a call, as a whole. The allowed transitions are: Pending_Initiator → Initialising (for outgoing calls, when Accept is called) Initialising → Initialised (for outgoing calls, when the remote client indicates that the user has been notified about the call. If the network is known not to provide feedback about whether the remote side is ringing, then the call should immediately be set to Ringing. Initialising → Initialised (for incoming calls, when e.g. the implementation has been initialised far enough that it is sensible to notify the user about the call (to reduce the probability that the user will pick up the call and have it immediately fail). The UI should then alert the user about the call, and call SetRinging) Initialised → Accepted (for outgoing calls to a contact, when the remote contact accepts the call; for incoming calls, when Accept is called.) Accepted → Active (when the local user successfully joins the call/conference, and media is known to be flowing successfully; also, when temporary connection problems are resolved (See below)). If the network is known not to provide feedback about when the call is properly connected, the call should immediately be set to Active. Active → Accepted (when there are temporary connection problems that the CM is aware of and able to recover from) any state → Ended (when the call is terminated normally, or when an error occurs that the CM is unable to recover from) Clients MAY consider unknown values from this enum to be an error - additional values will not be defined after the Call specification is declared to be stable. ]]> + +Bitfield/set of flags generated from the Telepathy specification. + <![CDATA[ A simple representation of the reason for a change in the call's state, which may be used by simple clients, or used as a fallback when the DBus_Reason member of a Call_State_Reason struct is not understood. ]]> + +Bitfield/set of flags generated from the Telepathy specification. @@ -7136,6 +7160,9 @@ + <![CDATA[ The network topology that an IP candidate represents. This can sometimes be used to infer what kind of performance characteristics (latency, bandwith, etc) can be expected of connections made to this candidate. ]]> + +Bitfield/set of flags generated from the Telepathy specification. @@ -7474,6 +7501,9 @@ disguised="1"> + <![CDATA[ A reason why captcha authentication was aborted by the client. ]]> + +Bitfield/set of flags generated from the Telepathy specification. @@ -7485,11 +7515,15 @@ c:identifier="TP_CAPTCHA_CANCEL_REASON_SERVICE_CONFUSED"/> + <![CDATA[ Extra flags to include with Captcha information ]]> + +Bitfield/set of flags generated from the Telepathy specification. + Bitfield/set of flags generated from the Telepathy specification. @@ -7903,8 +7937,7 @@ + version="0.11.15"> Return the #TpChannel:requested property the value of #TpChannel:requested @@ -8848,6 +8881,9 @@ + <![CDATA[ A set of flags representing call states. ]]> + +Bitfield/set of flags generated from the Telepathy specification. @@ -8866,6 +8902,7 @@ c:identifier="TP_CHANNEL_CALL_STATE_CONFERENCE_HOST"/> + Bitfield/set of flags generated from the Telepathy specification. + Bitfield/set of flags generated from the Telepathy specification. @@ -9772,6 +9810,9 @@ + <![CDATA[ The reason for a set of handles to move to one of Members, LocalPendingMembers or RemotePendingMembers, or to be removed from the group. A client may supply a reason when attempting to remove members from a group with RemoveMembersWithReason, and reasons are supplied by the CM when emitting MembersChanged and MembersChangedDetailed. Some reason codes have different meanings depending on the Actor in a MembersChanged signal. ]]> + +Bitfield/set of flags generated from the Telepathy specification. @@ -9810,6 +9851,7 @@ c:identifier="TP_CHANNEL_GROUP_CHANGE_REASON_SEPARATED"/> + Bitfield/set of flags generated from the Telepathy specification. @@ -9876,6 +9918,9 @@ + <![CDATA[ The channel-type-specific capability flags used for Channel.Type.StreamedMedia in the Connection.Interface.Capabilities interface. See the InitialAudio property for details of the mechanisms that will replace this. ]]> + +Bitfield/set of flags generated from the Telepathy specification. @@ -9896,6 +9941,7 @@ c:identifier="TP_CHANNEL_MEDIA_CAPABILITY_IMMUTABLE_STREAMS"/> + Bitfield/set of flags generated from the Telepathy specification. @@ -10199,6 +10245,7 @@ + Bitfield/set of flags generated from the Telepathy specification. @@ -10214,6 +10261,9 @@ + <![CDATA[ The type of message. ]]> + +Bitfield/set of flags generated from the Telepathy specification. @@ -10231,6 +10281,7 @@ c:identifier="TP_CHANNEL_TEXT_MESSAGE_TYPE_DELIVERY_REPORT"/> + Bitfield/set of flags generated from the Telepathy specification. @@ -10514,6 +10565,7 @@ glib:is-gtype-struct-for="ClientMessage"> + Bitfield/set of flags generated from the Telepathy specification. @@ -12861,12 +12913,14 @@ + Bitfield/set of flags generated from the Telepathy specification. + Bitfield/set of flags generated from the Telepathy specification. @@ -13842,6 +13896,7 @@ + Bitfield/set of flags generated from the Telepathy specification. @@ -13932,6 +13987,7 @@ + Bitfield/set of flags generated from the Telepathy specification. @@ -13944,6 +14000,9 @@ + <![CDATA[ A reason why the status of the connection changed. Apart from Requested, the values of this enumeration only make sense as reasons why the status changed to Disconnected. ]]> + +Bitfield/set of flags generated from the Telepathy specification. @@ -15120,6 +15179,7 @@ + Bitfield/set of flags generated from the Telepathy specification. @@ -15247,6 +15307,9 @@ + <![CDATA[ Flags describing the behaviour of a vCard field. ]]> + +Bitfield/set of flags generated from the Telepathy specification. @@ -15301,6 +15364,9 @@ + <![CDATA[ Flags defining the behaviour of contact information on this protocol. Some protocols provide no information on contacts without an explicit request; others always push information to the connection manager as and when it changes. ]]> + +Bitfield/set of flags generated from the Telepathy specification. @@ -15395,6 +15461,9 @@ + <![CDATA[ The progress made in retrieving the contact list. ]]> + +Bitfield/set of flags generated from the Telepathy specification. + <![CDATA[ Values of this enumeration indicate the extent to which metadata such as aliases and group memberships can be stored for the contacts on a particular connection. On some protocols, certain metadata (for instance, contact aliases) can only be stored for contacts on the contact list, or contacts with a particular contact list state. To make it easier to deal with such protocols, if clients set metadata on a contact who is not in the required state, the Connection MUST cache the metadata for the duration of the session. If clients request the attributes of that contact after the appropriate "set" method has returned successfully, the Connection MUST return the new (cached) value. If the contact is later placed in the required state to store metadata (for instance, if subscription to the contact's presence is requested, on a protocol like MSN where the alias has storage type Subscribed_Or_Pending), the connection MUST store the cached metadata at that time. If the Connection didn't cache changes in this way, a client intending to change the alias on MSN would have to wait until the server acknowledged the subscription request; in the meantime, other clients would still display the old alias. The only exception to that general rule is that if the Connection cannot store particular metadata at all (i.e. the storage type is None), it MUST reject attempts to set it. If the implementation knows that metadata can't be stored at all, it's useful to report that, which can be done synchronously. In general, user interfaces should detect storage type None and not display editing controls at all. ]]> + +Bitfield/set of flags generated from the Telepathy specification. @@ -16739,8 +16811,7 @@ + version="0.15.6"> Return the #TpDBusTubeChannel:service-name property the value of #TpDBusTubeChannel:service-name @@ -16838,6 +16909,7 @@ disguised="1"> + Bitfield/set of flags generated from the Telepathy specification. @@ -16866,6 +16938,7 @@ c:identifier="TP_DTMF_EVENT_LETTER_D"/> + Bitfield/set of flags generated from the Telepathy specification. + <![CDATA[ Flags indicating the level of support for delivery reporting on this channel, as found on the DeliveryReportingSupport property. Any future flags added to this set will conform to the convention that the presence of an extra flag implies that more operations will succeed. Note that CMs may always provide more reports than are requested in the Message_Sending_Flags passed to SendMessage. If senders want delivery reports, they should ask for them. If they don't want delivery reports, they can just ignore them, so there's no need to have capability discovery for what will happen if a delivery report isn't requested. ]]> + +Bitfield/set of flags generated from the Telepathy specification. @@ -16891,6 +16967,9 @@ c:identifier="TP_DELIVERY_REPORTING_SUPPORT_FLAG_RECEIVE_DELETED"/> + <![CDATA[ The status of a message as indicated by a delivery report. If this enum is extended in future specifications, this should only be to add new, non-overlapping conditions (i.e. all failures should still be signalled as either Temporarily_Failed or Permanently_Failed). If additional detail is required (e.g. distinguishing between the various types of permanent failure) this will be done using additional Delivery_Report_Header_Keys. ]]> + +Bitfield/set of flags generated from the Telepathy specification. @@ -17064,6 +17143,7 @@ c:identifier="TP_ERROR_CAPTCHA_NOT_SUPPORTED"/> + Bitfield/set of flags generated from the Telepathy specification. @@ -17497,6 +17577,7 @@ disguised="1"> + Bitfield/set of flags generated from the Telepathy specification. @@ -17518,6 +17599,7 @@ + Bitfield/set of flags generated from the Telepathy specification. @@ -18412,6 +18494,9 @@ + <![CDATA[ The HTTP Method with which to request a URL. ]]> + +Bitfield/set of flags generated from the Telepathy specification. @@ -18967,6 +19052,7 @@ + Bitfield/set of flags generated from the Telepathy specification. @@ -19868,6 +19954,9 @@ + <![CDATA[ The hold state of a channel. ]]> + +Bitfield/set of flags generated from the Telepathy specification. @@ -19880,6 +19969,9 @@ c:identifier="TP_LOCAL_HOLD_STATE_PENDING_UNHOLD"/> + <![CDATA[ The reason for a change to the Local_Hold_State. Clients MUST treat unknown values as equivalent to Local_Hold_State_Reason_None. ]]> + +Bitfield/set of flags generated from the Telepathy specification. @@ -19891,11 +19983,17 @@ c:identifier="TP_LOCAL_HOLD_STATE_REASON_RESOURCE_NOT_AVAILABLE"/> + <![CDATA[ Flags describing the Location features which may be supported on any given connection. ]]> + +Bitfield/set of flags generated from the Telepathy specification. + <![CDATA[ Flags representing capabilities provided by a connection manager. Those values can be used as bitfield. Some flags depend on, or conflict with, each other. Connections SHOULD implement as many of these features as the underlying protocol allows, preferring to implement Supports_Unread_Mails instead of Emits_Mails_Received if both are possible. ]]> + +Bitfield/set of flags generated from the Telepathy specification. @@ -19916,6 +20014,7 @@ c:identifier="TP_MAIL_NOTIFICATION_FLAG_THREAD_BASED"/> + Bitfield/set of flags generated from the Telepathy specification. @@ -19924,6 +20023,7 @@ c:identifier="TP_MEDIA_STREAM_BASE_PROTO_TCP"/> + Bitfield/set of flags generated from the Telepathy specification. @@ -19938,6 +20038,7 @@ c:identifier="TP_MEDIA_STREAM_DIRECTION_BIDIRECTIONAL"/> + Bitfield/set of flags generated from the Telepathy specification. @@ -19962,6 +20063,7 @@ c:identifier="TP_MEDIA_STREAM_ERROR_MEDIA_ERROR"/> + Bitfield/set of flags generated from the Telepathy specification. @@ -19970,6 +20072,7 @@ c:identifier="TP_MEDIA_STREAM_PENDING_REMOTE_SEND"/> + Bitfield/set of flags generated from the Telepathy specification. @@ -19982,6 +20085,7 @@ + Bitfield/set of flags generated from the Telepathy specification. @@ -19993,6 +20097,7 @@ c:identifier="TP_MEDIA_STREAM_TRANSPORT_TYPE_RELAY"/> + Bitfield/set of flags generated from the Telepathy specification. @@ -20568,6 +20673,9 @@ + <![CDATA[ Flags indicating the level of support for message parts on this channel. They are designed such that setting more flags always implies that the channel has more capabilities. If no flags are set, this indicates that messages may contain a single message part whose content-type is any of the types from SupportedContentTypes, possibly with some alternatives. There is no flag indicating support for alternatives. This is because the SendMessage implementation can always accept messages containing alternatives, even if the underlying protocol does not, by deleting all alternatives except the first (most preferred) that is supported. Each of the flags so far implies the previous flag, so we could have used a simple enumeration here; however, we've defined the message-part support indicator as a flag set for future expansion. See SupportedContentTypes for some examples. ]]> + +Bitfield/set of flags generated from the Telepathy specification. @@ -20576,6 +20684,9 @@ c:identifier="TP_MESSAGE_PART_SUPPORT_FLAG_MULTIPLE_ATTACHMENTS"/> + <![CDATA[ Flags altering the way a message is sent. The "most usual" action should always be to have these flags unset. Some indication of which flags are supported is provided by the DeliveryReportingSupport property. ]]> + +Bitfield/set of flags generated from the Telepathy specification. @@ -22834,6 +22945,7 @@ + Bitfield/set of flags generated from the Telepathy specification. @@ -23679,12 +23791,14 @@ + Bitfield/set of flags generated from the Telepathy specification. + Bitfield/set of flags generated from the Telepathy specification. @@ -23703,6 +23817,9 @@ + <![CDATA[ A type of access control for Rich_Presence_Access_Control. For most types, the exact access control is given by an associated variant. These are the access control types from XMPP publish/subscribe (XEP-0060). Location uses this for historical reasons, new interfaces will use Access_Control_Type. ]]> + +Bitfield/set of flags generated from the Telepathy specification. @@ -23717,6 +23834,9 @@ c:identifier="TP_RICH_PRESENCE_ACCESS_CONTROL_TYPE_OPEN"/> + <![CDATA[ A reason why SASL authentication was aborted by the client. ]]> + +Bitfield/set of flags generated from the Telepathy specification. @@ -23725,6 +23845,7 @@ c:identifier="TP_SASL_ABORT_REASON_USER_ABORT"/> + Bitfield/set of flags generated from the Telepathy specification. @@ -23748,6 +23869,9 @@ c:identifier="TP_SASL_STATUS_CLIENT_FAILED"/> + <![CDATA[ Enum indicating whether a contact is sending media. ]]> + +Bitfield/set of flags generated from the Telepathy specification. + <![CDATA[ The various types of service points a channel might connect to. ]]> + +Bitfield/set of flags generated from the Telepathy specification. + Bitfield/set of flags generated from the Telepathy specification. @@ -25416,6 +25544,7 @@ c:identifier="TP_SOCKET_ACCESS_CONTROL_CREDENTIALS"/> + Bitfield/set of flags generated from the Telepathy specification. @@ -25431,6 +25560,9 @@ + <![CDATA[ Flags indicating restrictions imposed on an Account by its storage method. ]]> + +Bitfield/set of flags generated from the Telepathy specification. @@ -25445,6 +25577,9 @@ c:identifier="TP_STORAGE_RESTRICTION_FLAG_CANNOT_SET_SERVICE"/> + <![CDATA[ Media streams can use more than one UDP socket: one for RTP (data) and one for RTCP (control). Most of the time, they are adjacent to each other, but some protocols (xmpp) signal each port separately. ]]> + +Bitfield/set of flags generated from the Telepathy specification. @@ -25454,6 +25589,9 @@ c:identifier="TP_STREAM_COMPONENT_CONTROL"/> + <![CDATA[ Represents the state of ICE negotiation for a single component of a stream to an endpoint. ]]> + +Bitfield/set of flags generated from the Telepathy specification. @@ -25471,6 +25609,9 @@ c:identifier="TP_STREAM_ENDPOINT_STATE_FAILED"/> + <![CDATA[ The type of SendingState and ReceivingState. ]]> + +Bitfield/set of flags generated from the Telepathy specification. @@ -25485,6 +25626,9 @@ c:identifier="TP_STREAM_FLOW_STATE_STARTED"/> + <![CDATA[ A transport that can be used for streaming. ]]> + +Bitfield/set of flags generated from the Telepathy specification. @@ -25603,8 +25747,7 @@ + version="0.13.2"> Return the #TpStreamTubeChannel:service property the value of #TpStreamTubeChannel:service @@ -25728,8 +25871,7 @@ Data structure representing a connection on a #TpStreamTubeChannel. + version="0.13.2"> Return the #TpStreamTubeConnection:channel property the value of #TpStreamTubeConnection:channel @@ -25738,8 +25880,7 @@ + version="0.13.2"> Return the #TpStreamTubeConnection:contact property the value of #TpStreamTubeConnection:contact @@ -25748,8 +25889,7 @@ + version="0.13.2"> Return the #TpStreamTubeConnection:socket-connection property the value of #TpStreamTubeConnection:socket-connection @@ -25799,7 +25939,7 @@ a #GError representing the error reported by the connection manager - + @@ -25816,6 +25956,9 @@ disguised="1"> + <![CDATA[ An enumeration indicating whether presence subscription is denied, denied but pending permission, or allowed. The exact semantics vary according to where this type is used: see the subscribe and publish contact attributes for details. ]]> + +Bitfield/set of flags generated from the Telepathy specification. @@ -25828,6 +25971,9 @@ + <![CDATA[ Possible reasons to reject a TLS certificate. ]]> + +Bitfield/set of flags generated from the Telepathy specification. @@ -25860,6 +26006,9 @@ c:identifier="TP_TLS_CERTIFICATE_REJECT_REASON_LIMIT_EXCEEDED"/> + <![CDATA[ The possible states for a TLSCertificate object. ]]> + +Bitfield/set of flags generated from the Telepathy specification. @@ -26204,8 +26353,7 @@ + version="0.13.10"> Return the #TpTextChannel:delivery-reporting-support property the value of #TpTextChannel:delivery-reporting-support property @@ -26215,8 +26363,7 @@ + version="0.13.10"> Return the #TpTextChannel:message-part-support-flags property the value of #TpTextChannel:message-part-support-flags @@ -26226,8 +26373,7 @@ + version="0.13.16"> Return the #TpTextChannel:message-types property the value of #TpTextChannel:message-types @@ -26337,8 +26483,7 @@ + version="0.13.10"> Return the #TpTextChannel:supported-content-types property the value of #TpTextChannel:supported-content-types @@ -26627,6 +26772,7 @@ disguised="1"> + Bitfield/set of flags generated from the Telepathy specification. @@ -26639,6 +26785,7 @@ c:identifier="TP_TUBE_CHANNEL_STATE_NOT_OFFERED"/> + Bitfield/set of flags generated from the Telepathy specification. @@ -26648,6 +26795,7 @@ + Bitfield/set of flags generated from the Telepathy specification. diff --git a/telepathy-glib/account-manager.c b/telepathy-glib/account-manager.c index 2312234..f373cc4 100644 --- a/telepathy-glib/account-manager.c +++ b/telepathy-glib/account-manager.c @@ -784,6 +784,9 @@ * #TpAccountManager to use that factory should call this after calling * tp_account_manager_new_with_factory(). * + * Unlike tp_account_manager_dup(), this function will keep an internal + * reference to @manager, so it will never be destroyed. + * * Note that @manager must use the default #TpDBusDaemon as returned by * tp_dbus_daemon_dup() * diff --git a/telepathy-glib/account.c b/telepathy-glib/account.c index 66d2d4e..005a29d 100644 --- a/telepathy-glib/account.c +++ b/telepathy-glib/account.c @@ -1723,7 +1723,7 @@ G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); /** - * TpAccount:nickname + * TpAccount:nickname: * * The nickname that should be set for the user on this account. * @@ -1826,7 +1826,7 @@ G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); /** - * TpAccount:normalized-name + * TpAccount:normalized-name: * * The normalized form of the user's own unique identifier on this * protocol. For example, on XMPP accounts this is the user's JID; on @@ -1925,7 +1925,7 @@ G_PARAM_STATIC_STRINGS | G_PARAM_READABLE)); /** - * TpAccount:storage-restrictions + * TpAccount:storage-restrictions: * * The storage restrictions for this account. * diff --git a/telepathy-glib/base-client.c b/telepathy-glib/base-client.c index 5906b30..26cd1cb 100644 --- a/telepathy-glib/base-client.c +++ b/telepathy-glib/base-client.c @@ -161,7 +161,7 @@ */ /** - * TpBaseClientDelegatedChannelsCb + * TpBaseClientDelegatedChannelsCb: * @client: a #TpBaseClient instance * @channels: (element-type TelepathyGLib.Channel): a #GPtrArray of #TpChannel * @user_data: arbitrary user-supplied data passed to @@ -2615,7 +2615,7 @@ } /** - * tp_base_client_get_name: (skip) + * tp_base_client_get_name: * @self: a #TpBaseClient * * Return the #TpBaseClient:name construct-only property, which is used as @@ -2632,7 +2632,7 @@ } /** - * tp_base_client_get_uniquify_name: (skip) + * tp_base_client_get_uniquify_name: * @self: a #TpBaseClient * * Return the #TpBaseClient:uniquify-name construct-only property; if this @@ -2650,7 +2650,7 @@ } /** - * tp_base_client_get_dbus_daemon: (skip) + * tp_base_client_get_dbus_daemon: * @self: a #TpBaseClient * * Return the #TpBaseClient:dbus-daemon construct-only property, which diff --git a/telepathy-glib/base-connection.c b/telepathy-glib/base-connection.c index 44cb4b1..fa026e8 100644 --- a/telepathy-glib/base-connection.c +++ b/telepathy-glib/base-connection.c @@ -160,7 +160,7 @@ * @create_channel_managers: Create an array of channel managers for this * Connection. At least one of this or @create_channel_factories must be set * by subclasses to a non-%NULL value. - * Since: 0.7.15 + * Since 0.7.15 * * The class of a #TpBaseConnection. Many members are virtual methods etc. * to be filled in in the subclass' class_init function. diff --git a/telepathy-glib/call-channel.c b/telepathy-glib/call-channel.c index f7d6705..81a2a49 100644 --- a/telepathy-glib/call-channel.c +++ b/telepathy-glib/call-channel.c @@ -77,7 +77,7 @@ GHashTable *state_details; TpCallStateReason *state_reason; gboolean hardware_streaming; - /* TpHandle -> TpCallMemberFlags */ + /* TpContact -> TpCallMemberFlags */ GHashTable *members; gboolean initial_audio; gboolean initial_video; @@ -270,14 +270,15 @@ TpContact *contact; /* The contact is supposed to already exists */ - contact = _tp_connection_lookup_contact (connection, handle); + contact = tp_connection_dup_contact_if_possible (connection, + handle, NULL); if (contact == NULL) { DEBUG ("No TpContact found for handle %u", handle); continue; } - g_ptr_array_add (result, g_object_ref (contact)); + g_ptr_array_add (result, contact); } return result; @@ -1046,7 +1047,7 @@ /** - * TpCallChannel::content-added + * TpCallChannel::content-added: * @self: the #TpCallChannel * @content: the newly added #TpCallContent * @@ -1066,7 +1067,7 @@ 1, G_TYPE_OBJECT); /** - * TpCallChannel::content-removed + * TpCallChannel::content-removed: * @self: the #TpCallChannel * @content: the newly removed #TpCallContent * @reason: a #TpCallStateReason @@ -1087,7 +1088,7 @@ 2, G_TYPE_OBJECT, TP_TYPE_CALL_STATE_REASON); /** - * TpCallChannel::state-changed + * TpCallChannel::state-changed: * @self: the #TpCallChannel * @state: the new #TpCallState * @flags: the new #TpCallFlags @@ -1109,7 +1110,7 @@ G_TYPE_HASH_TABLE); /** - * TpCallChannel::members-changed + * TpCallChannel::members-changed: * @self: the #TpCallChannel * @updates: (type GLib.HashTable) (element-type TelepathyGLib.Contact uint): * #GHashTable mapping #TpContact to its new #TpCallMemberFlags diff --git a/telepathy-glib/call-content.c b/telepathy-glib/call-content.c index 96584d4..7db4111 100644 --- a/telepathy-glib/call-content.c +++ b/telepathy-glib/call-content.c @@ -653,7 +653,7 @@ /** - * TpCallContent::removed + * TpCallContent::removed: * @self: the #TpCallContent * * The ::removed signal is emitted when @self is removed from @@ -669,7 +669,7 @@ 0); /** - * TpCallContent::streams-added + * TpCallContent::streams-added: * @self: the #TpCallContent * @streams: (type GLib.PtrArray) (element-type TelepathyGLib.CallStream): * a #GPtrArray of newly added #TpCallStream @@ -690,7 +690,7 @@ 1, G_TYPE_PTR_ARRAY); /** - * TpCallContent::streams-removed + * TpCallContent::streams-removed: * @self: the #TpCallContent * @streams: (type GLib.PtrArray) (element-type TelepathyGLib.CallStream): * a #GPtrArray of newly removed #TpCallStream diff --git a/telepathy-glib/call-stream.c b/telepathy-glib/call-stream.c index de5dd38..62d75d0 100644 --- a/telepathy-glib/call-stream.c +++ b/telepathy-glib/call-stream.c @@ -406,7 +406,7 @@ param_spec); /** - * TpCallStream::local-sending-state-changed + * TpCallStream::local-sending-state-changed: * @self: the #TpCallStream * @state: the new #TpSendingState * @reason: the #TpCallStateReason for the change @@ -425,7 +425,7 @@ G_TYPE_HASH_TABLE); /** - * TpCallStream::remote-members-changed + * TpCallStream::remote-members-changed: * @self: the #TpCallStream * @updates: (type GLib.HashTable) (element-type TelepathyGLib.Contact uint): * #GHashTable mapping #TpContact to its new #TpSendingState diff --git a/telepathy-glib/channel.c b/telepathy-glib/channel.c index 3417b92..80bc770 100644 --- a/telepathy-glib/channel.c +++ b/telepathy-glib/channel.c @@ -2331,7 +2331,7 @@ } /** - * tp_channel_get_requested: (skip) + * tp_channel_get_requested: * @self: a #TpChannel * * Return the #TpChannel:requested property diff --git a/telepathy-glib/dbus-properties-mixin.c b/telepathy-glib/dbus-properties-mixin.c index fc4319f..22ac713 100644 --- a/telepathy-glib/dbus-properties-mixin.c +++ b/telepathy-glib/dbus-properties-mixin.c @@ -1093,7 +1093,7 @@ * tp_dbus_properties_mixin_emit_properties_changed_varargs: (skip) * @object: an object which uses the D-Bus properties mixin * @interface_name: the interface on which properties have changed - * @...: (unqualified) property names whose values have changed, terminated by + * @...: unqualified property names whose values have changed, terminated by * %NULL. * * A shortcut for calling tp_dbus_properties_mixin_emit_properties_changed(). diff --git a/telepathy-glib/dbus-tube-channel.c b/telepathy-glib/dbus-tube-channel.c index 3ce22c2..b796e7b 100644 --- a/telepathy-glib/dbus-tube-channel.c +++ b/telepathy-glib/dbus-tube-channel.c @@ -474,7 +474,7 @@ } /** - * tp_dbus_tube_channel_get_service_name: (skip) + * tp_dbus_tube_channel_get_service_name: * @self: a #TpDBusTubeChannel * * Return the #TpDBusTubeChannel:service-name property @@ -596,7 +596,7 @@ } /** - * tp_dbus_tube_channel_offer_async + * tp_dbus_tube_channel_offer_async: * @self: an outgoing #TpDBusTubeChannel * @params: (allow-none) (transfer none): parameters of the tube, or %NULL * @callback: a callback to call when the tube has been offered @@ -710,7 +710,7 @@ } /** - * tp_dbus_tube_channel_accept_async + * tp_dbus_tube_channel_accept_async: * @self: an incoming #TpDBusTubeChannel * @callback: a callback to call when the tube has been offered * @user_data: data to pass to @callback diff --git a/telepathy-glib/errors.c b/telepathy-glib/errors.c index 2525687..8000d7f 100644 --- a/telepathy-glib/errors.c +++ b/telepathy-glib/errors.c @@ -182,40 +182,40 @@ * @TP_ERROR_CERT_REVOKED: org.freedesktop.Telepathy.Error.Cert.Revoked: * Raised if the server provided an SSL/TLS certificate that has been * revoked. - * Since: 0.11.12 + * Since 0.11.12 * @TP_ERROR_CERT_INSECURE: org.freedesktop.Telepathy.Error.Cert.Insecure: * Raised if the server provided an SSL/TLS certificate that uses an * insecure cipher algorithm or is cryptographically weak. - * Since: 0.11.12 + * Since 0.11.12 * @TP_ERROR_CERT_LIMIT_EXCEEDED: org.freedesktop.Telepathy.Error.Cert.LimitExceeded: * Raised if the length in bytes of the server certificate, or the depth * of the server certificate chain, exceed the limits imposed by the * crypto library. - * Since: 0.11.12 + * Since 0.11.12 * @TP_ERROR_NOT_YET: org.freedesktop.Telepathy.Error.NotYet: * Raised when the requested functionality is not yet available, but is * likely to become available after some time has passed. - * Since: 0.11.15 + * Since 0.11.15 * @TP_ERROR_REJECTED: org.freedesktop.Telepathy.Error.Rejected: * Raised when an incoming or outgoing call is rejected by the receiving * contact. - * Since: 0.13.2 + * Since 0.13.2 * @TP_ERROR_PICKED_UP_ELSEWHERE: org.freedesktop.Telepathy.Error.PickedUpElsewhere: * Raised when a call was terminated as a result of the local user * picking up the call on a different resource. - * Since: 0.13.3 + * Since 0.13.3 * @TP_ERROR_CONFUSED: org.freedesktop.Telepathy.Error.Confused: * Raised if a server rejects protocol messages from a connection manager * claiming that they do not make sense, two local processes fail to * understand each other, or an apparently impossible situation is * reached. This has a similar meaning to %TP_DBUS_ERROR_INCONSISTENT but * can be passed between processes via D-Bus. - * Since: 0.13.7 + * Since 0.13.7 * @TP_ERROR_SERVICE_CONFUSED: org.freedesktop.Telepathy.Error.ServiceConfused: * Raised when a server or other piece of infrastructure indicates an * internal error, or when a message that makes no sense is received from * a server or other piece of infrastructure. - * Since: 0.13.7 + * Since 0.13.7 * @TP_ERROR_EMERGENCY_CALLS_NOT_SUPPORTED: * org.freedesktop.Telepathy.Error.EmergencyCallsNotSupported: * Raised when a client attempts to dial a number that is recognized as an @@ -236,17 +236,17 @@ * org.freedesktop.Telepathy.Error.Media.CodecsIncompatible: * Raised when the local streaming implementation has no codecs in common * with the remote side. - * Since: 0.15.6 + * Since 0.15.6 * @TP_ERROR_MEDIA_UNSUPPORTED_TYPE: * org.freedesktop.Telepathy.Error.Media.UnsupportedType: * The media stream type requested is not supported by either the local or * remote side. - * Since: 0.15.6 + * Since 0.15.6 * @TP_ERROR_MEDIA_STREAMING_ERROR: * org.freedesktop.Telepathy.Error.Media.StreamingError: * Raised when the call's streaming implementation has some kind of internal * error. - * Since: 0.15.6 + * Since 0.15.6 * @TP_ERROR_CAPTCHA_NOT_SUPPORTED: * org.freedesktop.Telepathy.Error.Media.CaptchaNotSupported: * Raised if no UI is available to present captchas, or if one is diff --git a/telepathy-glib/handle.h b/telepathy-glib/handle.h index 79ad097..63743e2 100644 --- a/telepathy-glib/handle.h +++ b/telepathy-glib/handle.h @@ -49,7 +49,7 @@ #define TP_TYPE_HANDLE G_TYPE_UINT /** - * TP_UNKNOWN_HANDLE_TYPE + * TP_UNKNOWN_HANDLE_TYPE: * * An invalid handle type (-1 cast to TpHandleType) used to represent an * unknown handle type. diff --git a/telepathy-glib/introspection.am b/telepathy-glib/introspection.am index 2c7bebc..8c4cfd0 100644 --- a/telepathy-glib/introspection.am +++ b/telepathy-glib/introspection.am @@ -76,12 +76,6 @@ _gen/telepathy-interfaces.h \ $(NULL) -if OFFICIAL_RELEASE -SCANNER_WARN_ERROR = -else -SCANNER_WARN_ERROR = --warn-error -endif - TelepathyGLib_0_12_gir_NAMESPACE = TelepathyGLib TelepathyGLib_0_12_gir_VERSION = 0.12 TelepathyGLib_0_12_gir_LIBS = libtelepathy-glib.la @@ -93,7 +87,6 @@ -I$(top_srcdir) \ --c-include="telepathy-glib/telepathy-glib.h" \ --warn-all \ - $(SCANNER_WARN_ERROR) \ $(NULL) TelepathyGLib_0_12_gir_INCLUDES = \ diff --git a/telepathy-glib/presence-mixin.c b/telepathy-glib/presence-mixin.c index 2a50535..56955dd 100644 --- a/telepathy-glib/presence-mixin.c +++ b/telepathy-glib/presence-mixin.c @@ -112,7 +112,7 @@ */ /** - * TpPresenceStatusOptionalArgumentSpec + * TpPresenceStatusOptionalArgumentSpec: * @name: Name of the argument as passed over D-Bus * @dtype: D-Bus type signature of the argument * @@ -124,7 +124,7 @@ */ /** - * TpPresenceStatusSpec + * TpPresenceStatusSpec: * @name: String identifier of the presence status * @presence_type: A type value, as specified by #TpConnectionPresenceType * @self: Indicates if this status may be set on yourself @@ -303,11 +303,6 @@ const TpPresenceStatusSpec *supported_statuses, GHashTable *contact_statuses); -/** - * deep_copy_hashtable - * - * Make a deep copy of a GHashTable. - */ static GHashTable * deep_copy_hashtable (GHashTable *hash_table) { @@ -650,12 +645,11 @@ /** * tp_presence_mixin_add_status: (skip) + * @context: The D-Bus invocation context to use to return values + * or throw an error. * * Implements D-Bus method AddStatus * on interface org.freedesktop.Telepathy.Connection.Interface.Presence - * - * @context: The D-Bus invocation context to use to return values - * or throw an error. */ static void tp_presence_mixin_add_status (TpSvcConnectionInterfacePresence *iface, @@ -677,12 +671,11 @@ /** * tp_presence_mixin_clear_status: (skip) + * @context: The D-Bus invocation context to use to return values + * or throw an error. * * Implements D-Bus method ClearStatus * on interface org.freedesktop.Telepathy.Connection.Interface.Presence - * - * @context: The D-Bus invocation context to use to return values - * or throw an error. */ static void tp_presence_mixin_clear_status (TpSvcConnectionInterfacePresence *iface, @@ -711,12 +704,11 @@ /** * tp_presence_mixin_get_presence: (skip) + * @context: The D-Bus invocation context to use to return values + * or throw an error. * * Implements D-Bus method GetPresence * on interface org.freedesktop.Telepathy.Connection.Interface.Presence - * - * @context: The D-Bus invocation context to use to return values - * or throw an error. */ static void tp_presence_mixin_get_presence (TpSvcConnectionInterfacePresence *iface, @@ -834,12 +826,11 @@ /** * tp_presence_mixin_get_statuses: (skip) + * @context: The D-Bus invocation context to use to return values + * or throw an error. * * Implements D-Bus method GetStatuses * on interface org.freedesktop.Telepathy.Connection.Interface.Presence - * - * @context: The D-Bus invocation context to use to return values - * or throw an error. */ static void tp_presence_mixin_get_statuses (TpSvcConnectionInterfacePresence *iface, @@ -902,12 +893,11 @@ /** * tp_presence_mixin_set_last_activity_time: (skip) + * @context: The D-Bus invocation context to use to return values + * or throw an error. * * Implements D-Bus method SetLastActivityTime * on interface org.freedesktop.Telepathy.Connection.Interface.Presence - * - * @context: The D-Bus invocation context to use to return values - * or throw an error. */ static void tp_presence_mixin_set_last_activity_time (TpSvcConnectionInterfacePresence *iface, @@ -925,12 +915,11 @@ /** * tp_presence_mixin_remove_status: (skip) + * @context: The D-Bus invocation context to use to return values + * or throw an error. * * Implements D-Bus method RemoveStatus * on interface org.freedesktop.Telepathy.Connection.Interface.Presence - * - * @context: The D-Bus invocation context to use to return values - * or throw an error. */ static void tp_presence_mixin_remove_status (TpSvcConnectionInterfacePresence *iface, @@ -1001,12 +990,12 @@ /** * tp_presence_mixin_request_presence: (skip) + * @context: The D-Bus invocation context to use to return values + * or throw an error. * * Implements D-Bus method RequestPresence * on interface org.freedesktop.Telepathy.Connection.Interface.Presence * - * @context: The D-Bus invocation context to use to return values - * or throw an error. */ static void tp_presence_mixin_request_presence (TpSvcConnectionInterfacePresence *iface, @@ -1165,12 +1154,12 @@ /** * tp_presence_mixin_set_status: (skip) + * @context: The D-Bus invocation context to use to return values + * or throw an error. * * Implements D-Bus method SetStatus * on interface org.freedesktop.Telepathy.Connection.Interface.Presence * - * @context: The D-Bus invocation context to use to return values - * or throw an error. */ static void tp_presence_mixin_set_status (TpSvcConnectionInterfacePresence *iface, @@ -1370,12 +1359,11 @@ /** * tp_presence_mixin_simple_presence_set_presence: (skip) + * @context: The D-Bus invocation context to use to return values + * or throw an error. * * Implements D-Bus method SetPresence * on interface org.freedesktop.Telepathy.Connection.Interface.SimplePresence - * - * @context: The D-Bus invocation context to use to return values - * or throw an error. */ static void tp_presence_mixin_simple_presence_set_presence ( @@ -1501,12 +1489,12 @@ /** * tp_presence_mixin_get_simple_presence: (skip) + * @context: The D-Bus invocation context to use to return values + * or throw an error. * * Implements D-Bus method GetPresence * on interface org.freedesktop.Telepathy.Connection.Interface.SimplePresence * - * @context: The D-Bus invocation context to use to return values - * or throw an error. */ static void tp_presence_mixin_simple_presence_get_presences ( diff --git a/telepathy-glib/protocol.c b/telepathy-glib/protocol.c index 93c7044..34317a1 100644 --- a/telepathy-glib/protocol.c +++ b/telepathy-glib/protocol.c @@ -603,7 +603,7 @@ G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** - * TpProtocol:protocol-properties + * TpProtocol:protocol-properties: * * The immutable properties of this Protocol, as provided at construction * time. This is a map from string to #GValue, which must not be modified. @@ -1067,7 +1067,7 @@ } /** - * tp_protocol_get_authentication_types + * tp_protocol_get_authentication_types: * @self: a protocol object * * @@ -1680,7 +1680,7 @@ } /** - * tp_protocol_get_avatar_requirements + * tp_protocol_get_avatar_requirements: * @self: a #TpProtocol * * Return the #TpProtocol:avatar-requirements property diff --git a/telepathy-glib/simple-client-factory.c b/telepathy-glib/simple-client-factory.c index 0f3993d..fa8fd04 100644 --- a/telepathy-glib/simple-client-factory.c +++ b/telepathy-glib/simple-client-factory.c @@ -73,15 +73,6 @@ * TpSimpleClientFactory: * * Data structure representing a #TpSimpleClientFactory - * - * Since: 0.15.5 - */ - -/** - * TpSimpleClientFactoryClass: - * @parent_class: the parent class - * - * The class of a #TpSimpleClientFactory. * * Since: 0.15.5 */ @@ -858,9 +849,10 @@ g_return_val_if_fail (handle != 0, NULL); g_return_val_if_fail (identifier != NULL, NULL); - contact = _tp_connection_lookup_contact (connection, handle); + contact = tp_connection_dup_contact_if_possible (connection, + handle, identifier); if (contact != NULL) - return g_object_ref (contact); + return contact; contact = TP_SIMPLE_CLIENT_FACTORY_GET_CLASS (self)->create_contact (self, connection, handle, identifier); diff --git a/telepathy-glib/stream-tube-channel.c b/telepathy-glib/stream-tube-channel.c index 35aa6dd..4f266cf 100644 --- a/telepathy-glib/stream-tube-channel.c +++ b/telepathy-glib/stream-tube-channel.c @@ -439,7 +439,7 @@ g_object_class_install_property (gobject_class, PROP_PARAMETERS, param_spec); /** - * TpStreamTubeChannel::incoming + * TpStreamTubeChannel::incoming: * @self: the #TpStreamTubeChannel * @tube_connection: the #TpStreamTubeConnection for the connection * @@ -1511,7 +1511,7 @@ } /** - * tp_stream_tube_channel_get_service: (skip) + * tp_stream_tube_channel_get_service: * @self: a #TpStreamTubeChannel * * Return the #TpStreamTubeChannel:service property diff --git a/telepathy-glib/stream-tube-connection.c b/telepathy-glib/stream-tube-connection.c index 67e6573..03ea60d 100644 --- a/telepathy-glib/stream-tube-connection.c +++ b/telepathy-glib/stream-tube-connection.c @@ -239,7 +239,7 @@ g_object_class_install_property (object_class, PROP_CONTACT, param_spec); /** - * TpStreamTubeConnection::closed + * TpStreamTubeConnection::closed: * @self: the #TpStreamTubeConnection * @error: (transfer none): a #GError representing the error reported by the * connection manager @@ -254,7 +254,7 @@ G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL, G_TYPE_NONE, - 1, G_TYPE_POINTER); + 1, G_TYPE_ERROR); } TpStreamTubeConnection * @@ -269,7 +269,7 @@ } /** - * tp_stream_tube_connection_get_socket_connection: (skip) + * tp_stream_tube_connection_get_socket_connection: * @self: a #TpStreamTubeConnection * * Return the #TpStreamTubeConnection:socket-connection property @@ -285,7 +285,7 @@ } /** - * tp_stream_tube_connection_get_channel: (skip) + * tp_stream_tube_connection_get_channel: * @self: a #TpStreamTubeConnection * * Return the #TpStreamTubeConnection:channel property @@ -302,7 +302,7 @@ } /** - * tp_stream_tube_connection_get_contact: (skip) + * tp_stream_tube_connection_get_contact: * @self: a #TpStreamTubeConnection * * Return the #TpStreamTubeConnection:contact property diff --git a/telepathy-glib/text-channel.c b/telepathy-glib/text-channel.c index 46798b8..ccbe152 100644 --- a/telepathy-glib/text-channel.c +++ b/telepathy-glib/text-channel.c @@ -946,7 +946,7 @@ g_object_class_install_property (gobject_class, PROP_SMS_FLASH, param_spec); /** - * TpTextChannel::message-received + * TpTextChannel::message-received: * @self: the #TpTextChannel * @message: a #TpSignalledMessage * @@ -974,7 +974,7 @@ 1, TP_TYPE_SIGNALLED_MESSAGE); /** - * TpTextChannel::pending-message-removed + * TpTextChannel::pending-message-removed: * @self: the #TpTextChannel * @message: a #TpSignalledMessage * @@ -999,7 +999,7 @@ 1, TP_TYPE_SIGNALLED_MESSAGE); /** - * TpTextChannel::message-sent + * TpTextChannel::message-sent: * @self: the #TpTextChannel * @message: a #TpSignalledMessage * @flags: the #TpMessageSendingFlags affecting how the message was sent @@ -1093,7 +1093,7 @@ } /** - * tp_text_channel_get_supported_content_types: (skip) + * tp_text_channel_get_supported_content_types: * @self: a #TpTextChannel * * Return the #TpTextChannel:supported-content-types property @@ -1112,7 +1112,7 @@ } /** - * tp_text_channel_get_message_part_support_flags: (skip) + * tp_text_channel_get_message_part_support_flags: * @self: a #TpTextChannel * * Return the #TpTextChannel:message-part-support-flags property @@ -1131,7 +1131,7 @@ } /** - * tp_text_channel_get_delivery_reporting_support: (skip) + * tp_text_channel_get_delivery_reporting_support: * @self: a #TpTextChannel * * Return the #TpTextChannel:delivery-reporting-support property @@ -1563,7 +1563,7 @@ } /** - * tp_text_channel_get_message_types: (skip) + * tp_text_channel_get_message_types: * @self: a #TpTextChannel * * Return the #TpTextChannel:message-types property @@ -1582,7 +1582,7 @@ } /** - * tp_text_channel_supports_message_type + * tp_text_channel_supports_message_type: * @self: a #TpTextChannel * @message_type: a #TpChannelTextMessageType * diff --git a/tests/Makefile.in b/tests/Makefile.in index de2b8cd..3c1b4bf 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.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,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@ @@ -225,6 +242,11 @@ 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/||"`;; \ @@ -634,8 +656,11 @@ rm -f $$list install-testsPROGRAMS: $(tests_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(testsdir)" || $(MKDIR_P) "$(DESTDIR)$(testsdir)" @list='$(tests_PROGRAMS)'; test -n "$(testsdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(testsdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(testsdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p || test -f $$p1; \ @@ -788,8 +813,11 @@ -rm -rf .libs _libs install-testsDATA: $(tests_DATA) @$(NORMAL_INSTALL) - test -z "$(testsdir)" || $(MKDIR_P) "$(DESTDIR)$(testsdir)" @list='$(tests_DATA)'; test -n "$(testsdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(testsdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(testsdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -1065,13 +1093,10 @@ 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/dbus/Makefile.in b/tests/dbus/Makefile.in index bd20554..d82b8db 100644 --- a/tests/dbus/Makefile.in +++ b/tests/dbus/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 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@ @@ -683,6 +700,11 @@ $(test_stream_tube_SOURCES) $(test_text_channel_SOURCES) \ $(test_text_mixin_SOURCES) $(test_text_respawn_SOURCES) \ $(test_unsupported_interface_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(dbusconfig_DATA) $(dbusservice_DATA) $(managers_DATA) \ $(tests_DATA) ETAGS = etags @@ -1176,8 +1198,11 @@ rm -f $$list install-testsPROGRAMS: $(tests_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(testsdir)" || $(MKDIR_P) "$(DESTDIR)$(testsdir)" @list='$(tests_PROGRAMS)'; test -n "$(testsdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(testsdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(testsdir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p || test -f $$p1; \ @@ -1399,8 +1424,11 @@ $(AM_V_CCLD)$(LINK) $(test_unsupported_interface_OBJECTS) $(test_unsupported_interface_LDADD) $(LIBS) install-testsSCRIPTS: $(tests_SCRIPTS) @$(NORMAL_INSTALL) - test -z "$(testsdir)" || $(MKDIR_P) "$(DESTDIR)$(testsdir)" @list='$(tests_SCRIPTS)'; test -n "$(testsdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(testsdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(testsdir)" || 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; \ @@ -1540,8 +1568,11 @@ -rm -rf .libs _libs install-dbusconfigDATA: $(dbusconfig_DATA) @$(NORMAL_INSTALL) - test -z "$(dbusconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(dbusconfigdir)" @list='$(dbusconfig_DATA)'; test -n "$(dbusconfigdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(dbusconfigdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(dbusconfigdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -1558,8 +1589,11 @@ dir='$(DESTDIR)$(dbusconfigdir)'; $(am__uninstall_files_from_dir) install-dbusserviceDATA: $(dbusservice_DATA) @$(NORMAL_INSTALL) - test -z "$(dbusservicedir)" || $(MKDIR_P) "$(DESTDIR)$(dbusservicedir)" @list='$(dbusservice_DATA)'; test -n "$(dbusservicedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(dbusservicedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(dbusservicedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -1576,8 +1610,11 @@ dir='$(DESTDIR)$(dbusservicedir)'; $(am__uninstall_files_from_dir) install-managersDATA: $(managers_DATA) @$(NORMAL_INSTALL) - test -z "$(managersdir)" || $(MKDIR_P) "$(DESTDIR)$(managersdir)" @list='$(managers_DATA)'; test -n "$(managersdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(managersdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(managersdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -1594,8 +1631,11 @@ dir='$(DESTDIR)$(managersdir)'; $(am__uninstall_files_from_dir) install-testsDATA: $(tests_DATA) @$(NORMAL_INSTALL) - test -z "$(testsdir)" || $(MKDIR_P) "$(DESTDIR)$(testsdir)" @list='$(tests_DATA)'; test -n "$(testsdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(testsdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(testsdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff --git a/tests/lib/Makefile.in b/tests/lib/Makefile.in index 09c5869..16ea53a 100644 --- a/tests/lib/Makefile.in +++ b/tests/lib/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 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@ @@ -119,6 +136,11 @@ $(libtp_glib_tests_la_SOURCES) DIST_SOURCES = $(libtp_glib_tests_internal_la_SOURCES) \ $(libtp_glib_tests_la_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) diff --git a/tests/lib/dbus-tube-chan.c b/tests/lib/dbus-tube-chan.c index 7c615c8..8af4a16 100644 --- a/tests/lib/dbus-tube-chan.c +++ b/tests/lib/dbus-tube-chan.c @@ -17,6 +17,12 @@ #include #include #include + +#if defined(G_OS_UNIX) +# define LISTEN_ADDRESS "unix:tmpdir=/tmp" +#else +# define LISTEN_ADDRESS "tcp:host=127.0.0.1" +#endif enum { @@ -323,8 +329,7 @@ guid = g_dbus_generate_guid (); - self->priv->dbus_server = g_dbus_server_new_sync ( - "unix:abstract=dbus-tube-test", + self->priv->dbus_server = g_dbus_server_new_sync (LISTEN_ADDRESS, G_DBUS_SERVER_FLAGS_NONE, guid, NULL, NULL, &error); g_assert_no_error (error); diff --git a/tests/tools/Makefile.in b/tests/tools/Makefile.in index 6d6c724..0d1dae1 100644 --- a/tests/tools/Makefile.in +++ b/tests/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.5 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@ @@ -61,6 +78,11 @@ 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__tty_colors = \ red=; grn=; lgn=; blu=; std= DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) diff --git a/tools/Makefile.in b/tools/Makefile.in index 5ff1012..eae1bc4 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.5 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@ @@ -88,6 +105,11 @@ 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@ @@ -334,8 +356,11 @@ $(am__aclocal_m4_deps): install-toolsSCRIPTS: $(tools_SCRIPTS) @$(NORMAL_INSTALL) - test -z "$(toolsdir)" || $(MKDIR_P) "$(DESTDIR)$(toolsdir)" @list='$(tools_SCRIPTS)'; test -n "$(toolsdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(toolsdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(toolsdir)" || 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/tools/c-constants-gen.py b/tools/c-constants-gen.py index bc04849..4cba640 100644 --- a/tools/c-constants-gen.py +++ b/tools/c-constants-gen.py @@ -67,8 +67,7 @@ flags.getAttribute('name') self.d("""\ /** - * -%s: + * %s: """ % (self.prefix + name).replace('_', '')) for flag in get_by_path(flags, 'flag'): self.do_gtkdoc(flag, value_prefix) @@ -102,8 +101,7 @@ enum.getAttribute('name') + 's' self.d("""\ /** - * -%s: + * %s: """ % (self.prefix + name).replace('_', '')) vals = get_by_path(enum, 'enumvalue') for val in vals: diff --git a/tools/glib-gtypes-generator.py b/tools/glib-gtypes-generator.py index e5e6290..21dfc6a 100644 --- a/tools/glib-gtypes-generator.py +++ b/tools/glib-gtypes-generator.py @@ -91,7 +91,7 @@ docstring = get_docstring(mapping) or '(Undocumented)' - self.d('/**\n * %s:\n *\n' % name) + self.d('/**\n * %s:\n *\n' % name.strip()) self.d(' * %s\n' % xml_escape(docstring)) self.d(' *\n') self.d(' * This macro expands to a call to a function\n') diff --git a/vala/Makefile.in b/vala/Makefile.in index c1009c5..0f2e127 100644 --- a/vala/Makefile.in +++ b/vala/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 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@ @@ -60,6 +77,11 @@ 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/||"`;; \ @@ -323,8 +345,11 @@ -rm -rf .libs _libs install-dist_vapiDATA: $(dist_vapi_DATA) @$(NORMAL_INSTALL) - test -z "$(vapidir)" || $(MKDIR_P) "$(DESTDIR)$(vapidir)" @list='$(dist_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"; \ @@ -341,8 +366,11 @@ dir='$(DESTDIR)$(vapidir)'; $(am__uninstall_files_from_dir) install-vapiDATA: $(vapi_DATA) @$(NORMAL_INSTALL) - test -z "$(vapidir)" || $(MKDIR_P) "$(DESTDIR)$(vapidir)" @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"; \