[Pkg-telepathy-commits] [telepathy-mission-control-5] 02/05: Imported Upstream version 5.16.3
Simon McVittie
smcv at debian.org
Tue Sep 16 18:24:31 UTC 2014
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch debian
in repository telepathy-mission-control-5.
commit 7748f8d1ab8f163dd7dcc03b37a49e3f27e54e6a
Author: Simon McVittie <smcv at debian.org>
Date: Tue Sep 16 14:41:38 2014 +0100
Imported Upstream version 5.16.3
---
ChangeLog | 22 ++++++++++++++++++++++
NEWS | 7 +++++++
configure | 20 ++++++++++----------
configure.ac | 2 +-
.../html/McpAccountManager.html | 10 +++++-----
.../html/McpDispatchOperation.html | 12 ++++++------
.../mission-control-plugins/html/index.sgml | 4 ++--
.../html/mission-control-plugins.devhelp2 | 4 ++--
.../mission-control-plugins-sections.txt | 4 ++--
src/mcd-connection.c | 2 +-
10 files changed, 58 insertions(+), 29 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index a8726d3..572895e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+commit 84dc7d0fd952a9ef3d200ac5557cdf2daccca145
+Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
+Date: 2014-08-25 14:34:18 +0200
+
+ 5.16.3
+
+commit ab29ae42f751bf7e4ecc9a601e09cafab499fd14
+Author: Steffen Kieß <Steffen.Kiess at ipvs.uni-stuttgart.de>
+Date: 2014-08-25 14:11:35 +0200
+
+ mcd-connection: use tp_asv_new() properly
+
+ The second argument has to be the type of the value.
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=81751
+
+commit 810b32e92f2896a1ad8ee204bf6b8d5456a5db08
+Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
+Date: 2014-06-11 15:50:37 +0200
+
+ nano flag
+
commit fb8000842e0b20f4aa4928edd62736b5cea2e8d5
Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date: 2014-06-11 15:44:01 +0200
diff --git a/NEWS b/NEWS
index 19db653..7f2f682 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+telepathy-mission-control 5.16.3 (2014-08-25)
+=============================================
+
+Fixes:
+
+• mcd-connection: use tp_asv_new() properly (fd.o #81751, Steffen Kieß)
+
telepathy-mission-control 5.16.2 (2014-06-11)
=============================================
diff --git a/configure b/configure
index 93892db..9c81496 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.69 for telepathy-mission-control 5.16.2.
+# Generated by GNU Autoconf 2.69 for telepathy-mission-control 5.16.3.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='telepathy-mission-control'
PACKAGE_TARNAME='telepathy-mission-control'
-PACKAGE_VERSION='5.16.2'
-PACKAGE_STRING='telepathy-mission-control 5.16.2'
+PACKAGE_VERSION='5.16.3'
+PACKAGE_STRING='telepathy-mission-control 5.16.3'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1438,7 +1438,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures telepathy-mission-control 5.16.2 to adapt to many kinds of systems.
+\`configure' configures telepathy-mission-control 5.16.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1509,7 +1509,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of telepathy-mission-control 5.16.2:";;
+ short | recursive ) echo "Configuration of telepathy-mission-control 5.16.3:";;
esac
cat <<\_ACEOF
@@ -1685,7 +1685,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-telepathy-mission-control configure 5.16.2
+telepathy-mission-control configure 5.16.3
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2171,7 +2171,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by telepathy-mission-control $as_me 5.16.2, which was
+It was created by telepathy-mission-control $as_me 5.16.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3037,7 +3037,7 @@ fi
# Define the identity of the package.
PACKAGE='telepathy-mission-control'
- VERSION='5.16.2'
+ VERSION='5.16.3'
cat >>confdefs.h <<_ACEOF
@@ -18500,7 +18500,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by telepathy-mission-control $as_me 5.16.2, which was
+This file was extended by telepathy-mission-control $as_me 5.16.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -18566,7 +18566,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-telepathy-mission-control config.status 5.16.2
+telepathy-mission-control config.status 5.16.3
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 6024588..b1727f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
dnl Set the version number to e.g. 5.x.y immediately before a release.
dnl Set the version number to e.g. 5.x.y+ immediately after (this will
dnl enable -Werror).
-AC_INIT([telepathy-mission-control], [5.16.2])
+AC_INIT([telepathy-mission-control], [5.16.3])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_AUX_DIR([build-aux])
diff --git a/doc/reference/mission-control-plugins/html/McpAccountManager.html b/doc/reference/mission-control-plugins/html/McpAccountManager.html
index 04292d8..d185513 100644
--- a/doc/reference/mission-control-plugins/html/McpAccountManager.html
+++ b/doc/reference/mission-control-plugins/html/McpAccountManager.html
@@ -91,8 +91,8 @@
(<em class="parameter"><code>const <a class="link" href="McpAccountManager.html" title="McpAccountManager"><span class="type">McpAccountManager</span></a> *mcpa</code></em>,
<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>,
<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *attribute</code></em>);
- <a class="link" href="McpAccountManager.html#McpAccountManager-struct" title="McpAccountManager">McpAccountManager</a>;
<a class="link" href="McpAccountManager.html#McpAccountManagerIface" title="McpAccountManagerIface">McpAccountManagerIface</a>;
+ <a class="link" href="McpAccountManager.html#McpAccountManager-struct" title="McpAccountManager">McpAccountManager</a>;
</pre>
</div>
<div class="refsect1">
@@ -579,13 +579,13 @@ return <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macro
</div>
<hr>
<div class="refsect2">
-<a name="McpAccountManager-struct"></a><h3>McpAccountManager</h3>
-<pre class="programlisting">typedef struct _McpAccountManager McpAccountManager;</pre>
+<a name="McpAccountManagerIface"></a><h3>McpAccountManagerIface</h3>
+<pre class="programlisting">typedef struct _McpAccountManagerIface McpAccountManagerIface;</pre>
</div>
<hr>
<div class="refsect2">
-<a name="McpAccountManagerIface"></a><h3>McpAccountManagerIface</h3>
-<pre class="programlisting">typedef struct _McpAccountManagerIface McpAccountManagerIface;</pre>
+<a name="McpAccountManager-struct"></a><h3>McpAccountManager</h3>
+<pre class="programlisting">typedef struct _McpAccountManager McpAccountManager;</pre>
</div>
</div>
<div class="refsect1">
diff --git a/doc/reference/mission-control-plugins/html/McpDispatchOperation.html b/doc/reference/mission-control-plugins/html/McpDispatchOperation.html
index 741a96d..461eb6a 100644
--- a/doc/reference/mission-control-plugins/html/McpDispatchOperation.html
+++ b/doc/reference/mission-control-plugins/html/McpDispatchOperation.html
@@ -87,9 +87,9 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.htm
<span class="returnvalue">void</span> <a class="link" href="McpDispatchOperation.html#mcp-dispatch-operation-destroy-channels" title="mcp_dispatch_operation_destroy_channels ()">mcp_dispatch_operation_destroy_channels</a>
(<em class="parameter"><code><a class="link" href="McpDispatchOperation.html" title="McpDispatchOperation"><span class="type">McpDispatchOperation</span></a> *self</code></em>,
<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> wait_for_observers</code></em>);
+ <a class="link" href="McpDispatchOperation.html#McpDispatchOperationIface" title="McpDispatchOperationIface">McpDispatchOperationIface</a>;
<a class="link" href="McpDispatchOperation.html#McpDispatchOperationDelay" title="McpDispatchOperationDelay">McpDispatchOperationDelay</a>;
<a class="link" href="McpDispatchOperation.html#McpDispatchOperation-struct" title="McpDispatchOperation">McpDispatchOperation</a>;
- <a class="link" href="McpDispatchOperation.html#McpDispatchOperationIface" title="McpDispatchOperationIface">McpDispatchOperationIface</a>;
</pre>
</div>
<div class="refsect1">
@@ -639,6 +639,11 @@ use <a href="http://telepathy.freedesktop.org/doc/telepathy-glib-0.22.x/telepath
</div>
<hr>
<div class="refsect2">
+<a name="McpDispatchOperationIface"></a><h3>McpDispatchOperationIface</h3>
+<pre class="programlisting">typedef struct _McpDispatchOperationIface McpDispatchOperationIface;</pre>
+</div>
+<hr>
+<div class="refsect2">
<a name="McpDispatchOperationDelay"></a><h3>McpDispatchOperationDelay</h3>
<pre class="programlisting">typedef struct _McpDispatchOperationDelay McpDispatchOperationDelay;</pre>
</div>
@@ -647,11 +652,6 @@ use <a href="http://telepathy.freedesktop.org/doc/telepathy-glib-0.22.x/telepath
<a name="McpDispatchOperation-struct"></a><h3>McpDispatchOperation</h3>
<pre class="programlisting">typedef struct _McpDispatchOperation McpDispatchOperation;</pre>
</div>
-<hr>
-<div class="refsect2">
-<a name="McpDispatchOperationIface"></a><h3>McpDispatchOperationIface</h3>
-<pre class="programlisting">typedef struct _McpDispatchOperationIface McpDispatchOperationIface;</pre>
-</div>
</div>
<div class="refsect1">
<a name="McpDispatchOperation.see-also"></a><h2>See Also</h2>
diff --git a/doc/reference/mission-control-plugins/html/index.sgml b/doc/reference/mission-control-plugins/html/index.sgml
index 040dfc9..d2b1eb3 100644
--- a/doc/reference/mission-control-plugins/html/index.sgml
+++ b/doc/reference/mission-control-plugins/html/index.sgml
@@ -61,8 +61,8 @@
<ANCHOR id="mcp-account-manager-escape-variant-for-keyfile" href="mission-control-plugins/McpAccountManager.html#mcp-account-manager-escape-variant-for-keyfile">
<ANCHOR id="mcp-account-manager-unescape-value-from-keyfile" href="mission-control-plugins/McpAccountManager.html#mcp-account-manager-unescape-value-from-keyfile">
<ANCHOR id="mcp-account-manager-init-value-for-attribute" href="mission-control-plugins/McpAccountManager.html#mcp-account-manager-init-value-for-attribute">
-<ANCHOR id="McpAccountManager-struct" href="mission-control-plugins/McpAccountManager.html#McpAccountManager-struct">
<ANCHOR id="McpAccountManagerIface" href="mission-control-plugins/McpAccountManager.html#McpAccountManagerIface">
+<ANCHOR id="McpAccountManager-struct" href="mission-control-plugins/McpAccountManager.html#McpAccountManager-struct">
<ANCHOR id="McpAccountManager.see-also" href="mission-control-plugins/McpAccountManager.html#McpAccountManager.see-also">
<ANCHOR id="mission-control-plugins-McpRequestPolicy" href="mission-control-plugins/mission-control-plugins-McpRequestPolicy.html">
<ANCHOR id="mission-control-plugins-McpRequestPolicy.synopsis" href="mission-control-plugins/mission-control-plugins-McpRequestPolicy.html#mission-control-plugins-McpRequestPolicy.synopsis">
@@ -127,9 +127,9 @@
<ANCHOR id="mcp-dispatch-operation-leave-channels" href="mission-control-plugins/McpDispatchOperation.html#mcp-dispatch-operation-leave-channels">
<ANCHOR id="mcp-dispatch-operation-close-channels" href="mission-control-plugins/McpDispatchOperation.html#mcp-dispatch-operation-close-channels">
<ANCHOR id="mcp-dispatch-operation-destroy-channels" href="mission-control-plugins/McpDispatchOperation.html#mcp-dispatch-operation-destroy-channels">
+<ANCHOR id="McpDispatchOperationIface" href="mission-control-plugins/McpDispatchOperation.html#McpDispatchOperationIface">
<ANCHOR id="McpDispatchOperationDelay" href="mission-control-plugins/McpDispatchOperation.html#McpDispatchOperationDelay">
<ANCHOR id="McpDispatchOperation-struct" href="mission-control-plugins/McpDispatchOperation.html#McpDispatchOperation-struct">
-<ANCHOR id="McpDispatchOperationIface" href="mission-control-plugins/McpDispatchOperation.html#McpDispatchOperationIface">
<ANCHOR id="McpDispatchOperation.see-also" href="mission-control-plugins/McpDispatchOperation.html#McpDispatchOperation.see-also">
<ANCHOR id="annotation-glossterm-allow-none" href="mission-control-plugins/annotation-glossary.html#annotation-glossterm-allow-none">
<ANCHOR id="annotation-glossterm-element-type" href="mission-control-plugins/annotation-glossary.html#annotation-glossterm-element-type">
diff --git a/doc/reference/mission-control-plugins/html/mission-control-plugins.devhelp2 b/doc/reference/mission-control-plugins/html/mission-control-plugins.devhelp2
index d236bf9..fef2c71 100644
--- a/doc/reference/mission-control-plugins/html/mission-control-plugins.devhelp2
+++ b/doc/reference/mission-control-plugins/html/mission-control-plugins.devhelp2
@@ -70,8 +70,8 @@
<keyword type="function" name="mcp_account_manager_escape_variant_for_keyfile ()" link="McpAccountManager.html#mcp-account-manager-escape-variant-for-keyfile"/>
<keyword type="function" name="mcp_account_manager_unescape_value_from_keyfile ()" link="McpAccountManager.html#mcp-account-manager-unescape-value-from-keyfile"/>
<keyword type="function" name="mcp_account_manager_init_value_for_attribute ()" link="McpAccountManager.html#mcp-account-manager-init-value-for-attribute"/>
- <keyword type="struct" name="McpAccountManager" link="McpAccountManager.html#McpAccountManager-struct"/>
<keyword type="struct" name="McpAccountManagerIface" link="McpAccountManager.html#McpAccountManagerIface"/>
+ <keyword type="struct" name="McpAccountManager" link="McpAccountManager.html#McpAccountManager-struct"/>
<keyword type="function" name="McpRequestPolicyCb ()" link="mission-control-plugins-McpRequestPolicy.html#McpRequestPolicyCb"/>
<keyword type="function" name="mcp_request_policy_check ()" link="mission-control-plugins-McpRequestPolicy.html#mcp-request-policy-check"/>
<keyword type="function" name="mcp_request_policy_iface_implement_check ()" link="mission-control-plugins-McpRequestPolicy.html#mcp-request-policy-iface-implement-check"/>
@@ -112,8 +112,8 @@
<keyword type="function" name="mcp_dispatch_operation_leave_channels ()" link="McpDispatchOperation.html#mcp-dispatch-operation-leave-channels" deprecated=""/>
<keyword type="function" name="mcp_dispatch_operation_close_channels ()" link="McpDispatchOperation.html#mcp-dispatch-operation-close-channels"/>
<keyword type="function" name="mcp_dispatch_operation_destroy_channels ()" link="McpDispatchOperation.html#mcp-dispatch-operation-destroy-channels"/>
+ <keyword type="struct" name="McpDispatchOperationIface" link="McpDispatchOperation.html#McpDispatchOperationIface"/>
<keyword type="struct" name="McpDispatchOperationDelay" link="McpDispatchOperation.html#McpDispatchOperationDelay"/>
<keyword type="struct" name="McpDispatchOperation" link="McpDispatchOperation.html#McpDispatchOperation-struct"/>
- <keyword type="struct" name="McpDispatchOperationIface" link="McpDispatchOperation.html#McpDispatchOperationIface"/>
</functions>
</book>
diff --git a/doc/reference/mission-control-plugins/mission-control-plugins-sections.txt b/doc/reference/mission-control-plugins/mission-control-plugins-sections.txt
index 3ed29ce..e42f3e4 100644
--- a/doc/reference/mission-control-plugins/mission-control-plugins-sections.txt
+++ b/doc/reference/mission-control-plugins/mission-control-plugins-sections.txt
@@ -12,8 +12,8 @@ mcp_account_manager_escape_value_for_keyfile
mcp_account_manager_escape_variant_for_keyfile
mcp_account_manager_unescape_value_from_keyfile
mcp_account_manager_init_value_for_attribute
-McpAccountManager
McpAccountManagerIface
+McpAccountManager
<SUBSECTION Standard>
MCP_ACCOUNT_MANAGER
MCP_ACCOUNT_MANAGER_GET_IFACE
@@ -107,9 +107,9 @@ mcp_dispatch_operation_end_delay
mcp_dispatch_operation_leave_channels
mcp_dispatch_operation_close_channels
mcp_dispatch_operation_destroy_channels
+McpDispatchOperationIface
McpDispatchOperationDelay
McpDispatchOperation
-McpDispatchOperationIface
<SUBSECTION Standard>
MCP_DISPATCH_OPERATION
MCP_DISPATCH_OPERATION_GET_IFACE
diff --git a/src/mcd-connection.c b/src/mcd-connection.c
index e04ff78..e225da2 100644
--- a/src/mcd-connection.c
+++ b/src/mcd-connection.c
@@ -2267,7 +2267,7 @@ _mcd_connection_set_tp_connection (McdConnection *connection,
if (!priv->tp_conn)
{
GHashTable *details = tp_asv_new (
- "debug-message", inner_error->message,
+ "debug-message", G_TYPE_STRING, inner_error->message,
NULL);
/* Constructing a TpConnection can only fail from invalid arguments,
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/telepathy-mission-control-5.git
More information about the Pkg-telepathy-commits
mailing list