summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWill Thompson <will.thompson@collabora.co.uk>2012-11-16 15:56:12 +0000
committerWill Thompson <will.thompson@collabora.co.uk>2012-11-16 15:56:12 +0000
commit0195745c3e1516a4e5c694768b64941093f34719 (patch)
tree46c712927a19157863d8ce12b01b90a98194f4bc
parent4159cf378f26e8cd17d875667c68a3446e084acd (diff)
parent68b0e226381f21277c904cee88ce5013c5365456 (diff)
Merge branch 'telepathy-salut-0.8'
This updates the Wocky snapshot to include the stanza namespace fixes. They don't seem to cause any problems. Conflicts: NEWS configure.ac lib/ext/wocky src/tubes-channel.c
-rw-r--r--NEWS13
-rw-r--r--configure.ac3
m---------lib/ext/wocky0
3 files changed, 15 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index c8814ca6..27d76f7b 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,19 @@ Enhancements:
• Tube and Text channels are no longer announced together. (Jonny)
+• 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 --git a/configure.ac b/configure.ac
index f07ab526..6930e37e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -72,7 +72,8 @@ TP_COMPILER_WARNINGS([ERROR_CFLAGS], [test "x$official_release" = xno],
format-security \
init-self],
[missing-field-initializers \
- unused-parameter])
+ unused-parameter \
+ deprecated-declarations])
AC_SUBST([ERROR_CFLAGS])
ifelse(salut_nano_version, 0,
diff --git a/lib/ext/wocky b/lib/ext/wocky
-Subproject 8ad2d40ad4f1abb6c85db0a4b5404fac59d92ad
+Subproject 762c8281d37f065a174220e802afc599df2bcfd