Bug#693899: unblock: telepathy-salut/0.8.1-1
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please consider:
unblock telepathy-salut/0.8.1-1
This is a new upstream stable-branch release with some important bugfixes.
telepathy-salut (0.8.1-1) unstable; urgency=low
* New upstream release
- interoperates with iChat again (Closes: #693880)
- no longer crashes when you "Join Room...", then close the dialog,
in Empathy (Closes: #693881)
-- Simon McVittie <smcv@debian.org> Wed, 21 Nov 2012 13:30:35 +0000
Filtered diffstat, excluding regression tests and autoreconf/gtk-doc noise:
configure.ac | 5
telepathy-salut-0.8.1/ChangeLog | 201 ++++++++++
telepathy-salut-0.8.1/NEWS | 19
telepathy-salut-0.8.1/debian/changelog | 9
telepathy-salut-0.8.1/lib/ext/wocky/wocky/wocky-meta-porter.c | 26 -
telepathy-salut-0.8.1/src/contact-manager.c | 16
telepathy-salut-0.8.1/src/roomlist-channel.c | 1
telepathy-salut-0.8.1/src/tubes-channel.c | 11
8 files changed, 258 insertions(+), 30 deletions(-)
Filtered diff attached. Unfiltered diff, apart from debian/changelog, is at
http://anonscm.debian.org/gitweb/?p=pkg-telepathy/telepathy-salut.git;a=commitdiff;h=2d413e8d03f376e1e2677d3cca6dcd2962792812
Regards,
S
diff -Nru telepathy-salut-0.8.0/aclocal.m4 telepathy-salut-0.8.1/aclocal.m4
diff -Nru telepathy-salut-0.8.0/ChangeLog telepathy-salut-0.8.1/ChangeLog
--- telepathy-salut-0.8.0/ChangeLog 2012-04-04 17:39:39.000000000 +0100
+++ telepathy-salut-0.8.1/ChangeLog 2012-11-16 15:35:08.000000000 +0000
@@ -1,3 +1,204 @@
+commit cd32e00a3a461756cbf1f6899a0c2aa5bd5d79ee
+Author: Will Thompson <will.thompson@collabora.co.uk>
+Date: 2012-11-16 15:25:09 +0000
+
+ Version 0.8.1
+
+commit bc8485df70203ddefcc27c15fb76e4363637ab43
+Author: Will Thompson <will.thompson@collabora.co.uk>
+Date: 2012-11-16 15:24:53 +0000
+
+ NEWS for 0.8.1
+
+commit 9d9523ba8bcac11b19668a7e195ad1eb30f3d051
+Author: Will Thompson <will.thompson@collabora.co.uk>
+Date: 2012-11-16 14:36:16 +0000
+
+ Update Wocky snapshot to fix iChat interop.
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=51527
+
+commit 18aa2dc53316a85be7f23d46190b44cb090d2c7f
+Author: Will Thompson <will.thompson@collabora.co.uk>
+Date: 2012-11-16 15:06:25 +0000
+
+ Disable deprecation warnings for the stable branch
+
+commit 3227538bb99ccf695aa03efc25a76a7a23d29cbd
+Author: Will Thompson <will.thompson@collabora.co.uk>
+Date: 2012-11-16 14:31:57 +0000
+
+ NEWS for the patches I did not revert
+
+commit 67d77124ce304c8de98c60a52f21f6e30f96a808
+Author: Will Thompson <will.thompson@collabora.co.uk>
+Date: 2012-11-16 14:23:42 +0000
+
+ Revert "Use TP_ERROR instead of long-deprecated TP_ERRORS"
+
+ This reverts commit cd23b9a835033f837fe266b6eff18df64c41f8c8.
+
+commit 600a3bb495d44a594072f132f4caf3888af41b6a
+Author: Will Thompson <will.thompson@collabora.co.uk>
+Date: 2012-11-16 14:23:34 +0000
+
+ Revert "Use non-deprecated TpIntset APIs"
+
+ This reverts commit 9ef6d455d1ea4f48bfe300a1b3c5a89061edc81d.
+
+commit 56e59e520745b47206c49db8c7e9de52ff83de05
+Author: Will Thompson <will.thompson@collabora.co.uk>
+Date: 2012-11-16 14:23:30 +0000
+
+ Revert "Use non-deprecated TpMessage APIs"
+
+ This reverts commit 5c54074f0490f4b5f6b31ecd8f5df011ca32af83.
+
+commit cde4cdb087424bf200502e5e0fa86cb1437d7319
+Author: Will Thompson <will.thompson@collabora.co.uk>
+Date: 2012-11-16 14:23:22 +0000
+
+ Revert "Set G_MESSAGES_DEBUG during testing"
+
+ This reverts commit b6c32f8840ec4598885108f89d58a5a74ee04af8.
+
+commit 11bcaaa002b82bf16ef0051f77dc2da0e946b3ad
+Author: Will Thompson <will.thompson@collabora.co.uk>
+Date: 2012-11-16 14:23:13 +0000
+
+ Revert "Remove deprecated tp_handle_ref/unref"
+
+ This reverts commit c452d94fabbdf31c85963c81df3d5d566148f968.
+
+commit e1dbadd08dea266abfba27ec57a53a974539be3e
+Author: Will Thompson <will.thompson@collabora.co.uk>
+Date: 2012-11-16 14:22:37 +0000
+
+ Revert "Update Wocky snapshot"
+
+ This reverts commit caa206879f23ab24beacdda77e10ab972faff6e4.
+
+commit cbcc429bb56cbdac1e8e88e066de723b306a0c76
+Author: Will Thompson <will.thompson@collabora.co.uk>
+Date: 2012-11-16 14:22:28 +0000
+
+ Revert "NEWS for the patches I just backported"
+
+ This reverts commit 0eef9ba8a5a68854be43e655a6d3d9e667d648ca.
+
+commit fe20aeaba0f70553039c5e114e466fdfac5226c8
+Author: Will Thompson <will.thompson@collabora.co.uk>
+Date: 2012-11-16 14:22:25 +0000
+
+ Revert "Use telepathy-glib's versioned deprecation warnings."
+
+ This reverts commit a73b0c13faaab99927c44bebac7088d5c24ba6ea.
+
+commit a73b0c13faaab99927c44bebac7088d5c24ba6ea
+Author: Will Thompson <will.thompson@collabora.co.uk>
+Date: 2012-11-16 10:32:57 +0000
+
+ Use telepathy-glib's versioned deprecation warnings.
+
+commit 0eef9ba8a5a68854be43e655a6d3d9e667d648ca
+Author: Will Thompson <will.thompson@collabora.co.uk>
+Date: 2012-11-16 10:12:00 +0000
+
+ NEWS for the patches I just backported
+
+commit caa206879f23ab24beacdda77e10ab972faff6e4
+Author: Will Thompson <will.thompson@collabora.co.uk>
+Date: 2012-11-12 14:34:55 +0000
+
+ Update Wocky snapshot
+
+ There are no particularly significant changes, but this pulls in the fix
+ for https://bugs.freedesktop.org/show_bug.cgi?id=37701 among other
+ things.
+
+commit 973bff2a35600a56ef8a4afb49a6a0d5df4a384a
+Author: Will Thompson <will.thompson@collabora.co.uk>
+Date: 2012-07-02 15:24:22 +0100
+
+ Don't crash when closing a roomlist channel.
+
+ TpBaseChannel requires that the 'close' vfunc be implemented, even if
+ the implementation is literally tp_base_channel_destroyed() because
+ there is no clean-up to do. As a result, Empathy pre-emptively
+ requesting a roomlist channel when you open the Join Room… dialog would
+ crash Salut when you close that dialog.
+
+commit 6199eab3f074c3159b31389a37e432bf9f69cd76
+Author: Will Thompson <will.thompson@collabora.co.uk>
+Date: 2012-07-02 15:19:21 +0100
+
+ tubes: don't use an uninitialized tube_id.
+
+ gcc rightly points out that tube_id may be uninitialized if
+ extract_tube_information() returns false.
+
+commit c452d94fabbdf31c85963c81df3d5d566148f968
+Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
+Date: 2012-05-10 15:10:10 +0200
+
+ Remove deprecated tp_handle_ref/unref
+
+commit b6c32f8840ec4598885108f89d58a5a74ee04af8
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2012-05-07 19:25:41 +0100
+
+ Set G_MESSAGES_DEBUG during testing
+
+ The same as Gabble commit cbfa9d06.
+
+commit 5c54074f0490f4b5f6b31ecd8f5df011ca32af83
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2012-05-07 18:31:52 +0100
+
+ Use non-deprecated TpMessage APIs
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=49594
+ Reviewed-by: Xavier Claessens <xavier.claessens@collabora.co.uk>
+
+commit 9ef6d455d1ea4f48bfe300a1b3c5a89061edc81d
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2012-05-07 17:21:37 +0100
+
+ Use non-deprecated TpIntset APIs
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=49594
+ Reviewed-by: Xavier Claessens <xavier.claessens@collabora.co.uk>
+
+commit cd23b9a835033f837fe266b6eff18df64c41f8c8
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2012-05-07 17:17:15 +0100
+
+ Use TP_ERROR instead of long-deprecated TP_ERRORS
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=49594
+ Reviewed-by: Xavier Claessens <xavier.claessens@collabora.co.uk>
+
+commit 077a77aee8fc3bde292f60786059b27cc03e7428
+Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
+Date: 2012-04-05 12:52:25 -0400
+
+ contact-manager: safely return if called after having cleaned up
+
+ The OLPC activity manager's removed-service callback was looking up a
+ contact after the contact manager had cleaned up (but not disposed)
+ which was causing an assertion. The activity manager should arguably
+ disconnect from said signals...
+
+ Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
+
+commit 58a36c1de45657a0c3da327ffd90885694623e80
+Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
+Date: 2012-04-04 12:44:41 -0400
+
+ start on version 0.8.1
+
+ Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
+
commit aa7c846dd852ec7eb3900e90e1ed449a813e0d64
Author: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date: 2012-04-04 12:36:24 -0400
diff -Nru telepathy-salut-0.8.0/config.sub telepathy-salut-0.8.1/config.sub
diff -Nru telepathy-salut-0.8.0/configure telepathy-salut-0.8.1/configure
diff -Nru telepathy-salut-0.8.0/configure.ac telepathy-salut-0.8.1/configure.ac
--- telepathy-salut-0.8.0/configure.ac 2012-04-04 17:36:21.000000000 +0100
+++ telepathy-salut-0.8.1/configure.ac 2012-11-16 15:25:01.000000000 +0000
@@ -9,7 +9,7 @@
m4_define([salut_major_version], [0])
m4_define([salut_minor_version], [8])
-m4_define([salut_micro_version], [0])
+m4_define([salut_micro_version], [1])
m4_define([salut_nano_version], [0])
# Some magic
@@ -72,7 +72,8 @@
format-security \
init-self],
[missing-field-initializers \
- unused-parameter])
+ unused-parameter \
+ deprecated-declarations])
AC_SUBST([ERROR_CFLAGS])
ifelse(salut_nano_version, 0,
diff -Nru telepathy-salut-0.8.0/data/Makefile.in telepathy-salut-0.8.1/data/Makefile.in
diff -Nru telepathy-salut-0.8.0/debian/changelog telepathy-salut-0.8.1/debian/changelog
--- telepathy-salut-0.8.0/debian/changelog 2012-04-27 17:36:22.000000000 +0100
+++ telepathy-salut-0.8.1/debian/changelog 2012-11-21 13:30:48.000000000 +0000
@@ -1,3 +1,12 @@
+telepathy-salut (0.8.1-1) unstable; urgency=low
+
+ * New upstream release
+ - interoperates with iChat again (Closes: #693880)
+ - no longer crashes when you "Join Room...", then close the dialog,
+ in Empathy (Closes: #693881)
+
+ -- Simon McVittie <smcv@debian.org> Wed, 21 Nov 2012 13:30:35 +0000
+
telepathy-salut (0.8.0-2) unstable; urgency=low
* Release to unstable
diff -Nru telepathy-salut-0.8.0/depcomp telepathy-salut-0.8.1/depcomp
diff -Nru telepathy-salut-0.8.0/docs/Makefile.in telepathy-salut-0.8.1/docs/Makefile.in
diff -Nru telepathy-salut-0.8.0/extensions/Makefile.in telepathy-salut-0.8.1/extensions/Makefile.in
diff -Nru telepathy-salut-0.8.0/lib/ext/Makefile.in telepathy-salut-0.8.1/lib/ext/Makefile.in
diff -Nru telepathy-salut-0.8.0/lib/ext/wocky/aclocal.m4 telepathy-salut-0.8.1/lib/ext/wocky/aclocal.m4
diff -Nru telepathy-salut-0.8.0/lib/ext/wocky/config.sub telepathy-salut-0.8.1/lib/ext/wocky/config.sub
diff -Nru telepathy-salut-0.8.0/lib/ext/wocky/configure telepathy-salut-0.8.1/lib/ext/wocky/configure
diff -Nru telepathy-salut-0.8.0/lib/ext/wocky/depcomp telepathy-salut-0.8.1/lib/ext/wocky/depcomp
diff -Nru telepathy-salut-0.8.0/lib/ext/wocky/docs/Makefile.in telepathy-salut-0.8.1/lib/ext/wocky/docs/Makefile.in
diff -Nru telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/api-index-full.html telepathy-salut-0.8.1/lib/ext/wocky/docs/reference/html/api-index-full.html
diff -Nru telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/ch01.html telepathy-salut-0.8.1/lib/ext/wocky/docs/reference/html/ch01.html
diff -Nru telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/index.html telepathy-salut-0.8.1/lib/ext/wocky/docs/reference/html/index.html
diff -Nru telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/index.sgml telepathy-salut-0.8.1/lib/ext/wocky/docs/reference/html/index.sgml
diff -Nru telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/object-tree.html telepathy-salut-0.8.1/lib/ext/wocky/docs/reference/html/object-tree.html
diff -Nru telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky.devhelp2 telepathy-salut-0.8.1/lib/ext/wocky/docs/reference/html/wocky.devhelp2
diff -Nru telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/WockyNodeTree.html telepathy-salut-0.8.1/lib/ext/wocky/docs/reference/html/WockyNodeTree.html
diff -Nru telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-Wocky-GnuTLS-TLS.html telepathy-salut-0.8.1/lib/ext/wocky/docs/reference/html/wocky-Wocky-GnuTLS-TLS.html
diff -Nru telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-WockyNode.html telepathy-salut-0.8.1/lib/ext/wocky/docs/reference/html/wocky-WockyNode.html
diff -Nru telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-Wocky-OpenSSL-TLS.html telepathy-salut-0.8.1/lib/ext/wocky/docs/reference/html/wocky-Wocky-OpenSSL-TLS.html
diff -Nru telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-WockyStanza.html telepathy-salut-0.8.1/lib/ext/wocky/docs/reference/html/wocky-WockyStanza.html
diff -Nru telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-wocky-tls-enumtypes.html telepathy-salut-0.8.1/lib/ext/wocky/docs/reference/html/wocky-wocky-tls-enumtypes.html
diff -Nru telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/html/wocky-WockyTLSHandler.html telepathy-salut-0.8.1/lib/ext/wocky/docs/reference/html/wocky-WockyTLSHandler.html
diff -Nru telepathy-salut-0.8.0/lib/ext/wocky/docs/reference/Makefile.in telepathy-salut-0.8.1/lib/ext/wocky/docs/reference/Makefile.in
diff -Nru telepathy-salut-0.8.0/lib/ext/wocky/examples/Makefile.in telepathy-salut-0.8.1/lib/ext/wocky/examples/Makefile.in
diff -Nru telepathy-salut-0.8.0/lib/ext/wocky/ltmain.sh telepathy-salut-0.8.1/lib/ext/wocky/ltmain.sh
diff -Nru telepathy-salut-0.8.0/lib/ext/wocky/m4/libtool.m4 telepathy-salut-0.8.1/lib/ext/wocky/m4/libtool.m4
diff -Nru telepathy-salut-0.8.0/lib/ext/wocky/m4/Makefile.in telepathy-salut-0.8.1/lib/ext/wocky/m4/Makefile.in
diff -Nru telepathy-salut-0.8.0/lib/ext/wocky/Makefile.in telepathy-salut-0.8.1/lib/ext/wocky/Makefile.in
diff -Nru telepathy-salut-0.8.0/lib/ext/wocky/tests/Makefile.in telepathy-salut-0.8.1/lib/ext/wocky/tests/Makefile.in
diff -Nru telepathy-salut-0.8.0/lib/ext/wocky/tools/Makefile.in telepathy-salut-0.8.1/lib/ext/wocky/tools/Makefile.in
diff -Nru telepathy-salut-0.8.0/lib/ext/wocky/wocky/Makefile.in telepathy-salut-0.8.1/lib/ext/wocky/wocky/Makefile.in
diff -Nru telepathy-salut-0.8.0/lib/ext/wocky/wocky/wocky-meta-porter.c telepathy-salut-0.8.1/lib/ext/wocky/wocky/wocky-meta-porter.c
--- telepathy-salut-0.8.0/lib/ext/wocky/wocky/wocky-meta-porter.c 2012-04-03 22:24:55.000000000 +0100
+++ telepathy-salut-0.8.1/lib/ext/wocky/wocky/wocky-meta-porter.c 2012-11-16 15:08:43.000000000 +0000
@@ -1218,25 +1218,13 @@
g_assert (g_hash_table_lookup (handler->porters, porter) == NULL);
- if (handler->contact != NULL)
- {
- gchar *jid = wocky_contact_dup_jid (handler->contact);
-
- id = wocky_porter_register_handler_from_by_stanza (porter,
- handler->type, handler->sub_type, jid,
- handler->priority, porter_handler_cb, handler,
- handler->stanza);
-
- g_free (jid);
- }
- else
- {
- id = wocky_porter_register_handler_from_anyone_by_stanza (porter,
- handler->type, handler->sub_type,
- handler->priority, porter_handler_cb, handler,
- handler->stanza);
- }
-
+ /* If handler->contact is not NULL, we know that this c2s porter is a
+ * connection to them, so we still don't need to tell it to match the sender.
+ */
+ id = wocky_porter_register_handler_from_anyone_by_stanza (porter,
+ handler->type, handler->sub_type,
+ handler->priority, porter_handler_cb, handler,
+ handler->stanza);
g_hash_table_insert (handler->porters, porter, GUINT_TO_POINTER (id));
g_object_weak_ref (G_OBJECT (porter),
diff -Nru telepathy-salut-0.8.0/lib/gibber/Makefile.in telepathy-salut-0.8.1/lib/gibber/Makefile.in
diff -Nru telepathy-salut-0.8.0/lib/gibber/tests/Makefile.in telepathy-salut-0.8.1/lib/gibber/tests/Makefile.in
diff -Nru telepathy-salut-0.8.0/lib/Makefile.in telepathy-salut-0.8.1/lib/Makefile.in
diff -Nru telepathy-salut-0.8.0/ltmain.sh telepathy-salut-0.8.1/ltmain.sh
diff -Nru telepathy-salut-0.8.0/m4/libtool.m4 telepathy-salut-0.8.1/m4/libtool.m4
diff -Nru telepathy-salut-0.8.0/m4/Makefile.in telepathy-salut-0.8.1/m4/Makefile.in
diff -Nru telepathy-salut-0.8.0/Makefile.in telepathy-salut-0.8.1/Makefile.in
diff -Nru telepathy-salut-0.8.0/NEWS telepathy-salut-0.8.1/NEWS
--- telepathy-salut-0.8.0/NEWS 2012-04-04 17:36:13.000000000 +0100
+++ telepathy-salut-0.8.1/NEWS 2012-11-16 15:24:40.000000000 +0000
@@ -1,3 +1,22 @@
+telepathy-salut 0.8.1 (2012-11-16)
+==================================
+
+Here are some crash fixes, and a pretty important fix which means we can
+talk to iChat again.
+
+• Fix an assertion failure in the OLPC activity manager on disconnect.
+ (Jonny)
+
+• Check parsing tube messages in a MUC succeeds, to avoid using an
+ uninitialized variable. (Will)
+
+• Don't crash when closing a roomlist channel. (Will)
+
+• fd.o#51527: fix interoperability with iChat (oops). This also fixes
+ fd.o#51528, a crash when messaged by a malformed JID such as
+ "wjt@bael (2)". (Will)
+
+
telepathy-salut 0.8.0 (2012-04-04)
==================================
diff -Nru telepathy-salut-0.8.0/plugins/Makefile.in telepathy-salut-0.8.1/plugins/Makefile.in
diff -Nru telepathy-salut-0.8.0/salut/Makefile.in telepathy-salut-0.8.1/salut/Makefile.in
diff -Nru telepathy-salut-0.8.0/src/contact-manager.c telepathy-salut-0.8.1/src/contact-manager.c
--- telepathy-salut-0.8.0/src/contact-manager.c 2012-04-03 22:24:48.000000000 +0100
+++ telepathy-salut-0.8.1/src/contact-manager.c 2012-11-16 14:04:54.000000000 +0000
@@ -397,16 +397,20 @@
SalutContact *
salut_contact_manager_get_contact (SalutContactManager *mgr, TpHandle handle)
{
- TpHandleRepoIface *handle_repo = tp_base_connection_get_handles (
- TP_BASE_CONNECTION (mgr->connection), TP_HANDLE_TYPE_CONTACT);
- const char *name = tp_handle_inspect (handle_repo, handle);
+ TpHandleRepoIface *handle_repo;
+ const char *name;
SalutContact *ret;
- g_return_val_if_fail (name, NULL);
-
- if (mgr->contacts == NULL)
+ /* have we already closed everything? */
+ if (mgr->connection == NULL || mgr->contacts == NULL)
return NULL;
+ handle_repo = tp_base_connection_get_handles (
+ TP_BASE_CONNECTION (mgr->connection), TP_HANDLE_TYPE_CONTACT);
+ name = tp_handle_inspect (handle_repo, handle);
+
+ g_return_val_if_fail (name, NULL);
+
DEBUG ("Getting contact for: %s", name);
ret = g_hash_table_lookup (mgr->contacts, name);
diff -Nru telepathy-salut-0.8.0/src/Makefile.in telepathy-salut-0.8.1/src/Makefile.in
diff -Nru telepathy-salut-0.8.0/src/roomlist-channel.c telepathy-salut-0.8.1/src/roomlist-channel.c
--- telepathy-salut-0.8.0/src/roomlist-channel.c 2012-04-03 22:24:48.000000000 +0100
+++ telepathy-salut-0.8.1/src/roomlist-channel.c 2012-11-16 14:38:18.000000000 +0000
@@ -135,6 +135,7 @@
base_class->target_handle_type = TP_HANDLE_TYPE_NONE;
base_class->fill_immutable_properties =
salut_roomlist_channel_fill_immutable_properties;
+ base_class->close = tp_base_channel_destroyed;
param_spec = g_param_spec_string ("conference-server",
"Name of conference server to use",
diff -Nru telepathy-salut-0.8.0/src/tubes-channel.c telepathy-salut-0.8.1/src/tubes-channel.c
--- telepathy-salut-0.8.0/src/tubes-channel.c 2012-04-03 22:24:48.000000000 +0100
+++ telepathy-salut-0.8.1/src/tubes-channel.c 2012-11-16 14:38:18.000000000 +0000
@@ -658,14 +658,19 @@
{
WockyNode *tube_node = (WockyNode *) l->data;
const gchar *stream_id;
- SalutTubeIface *tube;
+ SalutTubeIface *tube = NULL;
guint tube_id;
TpTubeType type;
stream_id = wocky_node_get_attribute (tube_node, "stream-id");
- extract_tube_information (self, tube_node, NULL,
- NULL, NULL, NULL, &tube_id);
+ if (!extract_tube_information (self, tube_node, NULL,
+ NULL, NULL, NULL, &tube_id))
+ {
+ DEBUG ("can't find a tube ID; never mind then.");
+ continue;
+ }
+
tube = g_hash_table_lookup (priv->tubes, GUINT_TO_POINTER (tube_id));
if (tube == NULL)
diff -Nru telepathy-salut-0.8.0/tests/Makefile.in telepathy-salut-0.8.1/tests/Makefile.in
diff -Nru telepathy-salut-0.8.0/tests/twisted/avahi/roomlist.py telepathy-salut-0.8.1/tests/twisted/avahi/roomlist.py
diff -Nru telepathy-salut-0.8.0/tests/twisted/config.py telepathy-salut-0.8.1/tests/twisted/config.py
diff -Nru telepathy-salut-0.8.0/tests/twisted/Makefile.in telepathy-salut-0.8.1/tests/twisted/Makefile.in
diff -Nru telepathy-salut-0.8.0/tests/twisted/tools/Makefile.in telepathy-salut-0.8.1/tests/twisted/tools/Makefile.in
diff -Nru telepathy-salut-0.8.0/tools/Makefile.in telepathy-salut-0.8.1/tools/Makefile.in
Reply to: