Merge branch 'telepathy-gabble-0.18'

.gitignore

@@ -3,12 +3,14 @@
 *.gcno
 *.gcov
 *.l[ao]
+*.log
 *.loT
 *.orig
 *.pc
 *.py[co]
 *.rej
 *.sw[op]
+*.trs
 *~
 *#
 .#*
@@ -103,3 +105,4 @@ cscope.out
 /tests/twisted/tools/with-session-bus-*.bustle-logs
 /tests/twisted/with-session-bus-*.address
 /tests/twisted/with-session-bus-*.pid
+/tools/telepathy-glib-env

NEWS

@@ -52,6 +52,63 @@ Internal changes:
 • Remove regression tests for obsolete APIs to reduce delta between
   0.20 and 1.0 branches (Simon, Guillaume)
 
+telepathy-gabble 0.18.4 (2016-11-15)
+====================================
+
+The "crawling" release.
+
+Fixes:
+
+• Update wocky
+   · Use SoupSession instead of SoupSessionAsync to fix
+      function deprecation errors (fd.o #96383, Diane Trout)
+   · Replaced deprecated usage of gnutls_certificate_credentials
+      with gnutls_certificate_credentials_t (George Kiagiadakis)
+   · Updated CRL of the ssl-related unit tests to fix errors
+      when running the tests with the openssl backend, due to
+      the CRL being expired (fd.o #79548, Diane Trout)
+   · Renamed a unit test to avoid duplicate test names, which
+      is an error in recent GLib versions (Diane Trout)
+   · Removed WockyHttpProxy in favour of GIO http proxy,
+      fixing a failing unit test (fd.o #94031, George Kiagiadakis)
+   · Bumped GLib dependency to 2.44 for using the GIO
+      http proxy (George Kiagiadakis)
+   · Fixed a race condition in the wocky-connector-test (George
+      Kiagiadakis)
+
+• Replaced deprecated _BSD_SOURCE with _DEFAULT_SOURCE
+   to fix compilation with recent glibc (Diane Trout)
+
+• Make XEP-0030 disco#info query advertise the disco#info feature
+  (fd.o #98127, Maxime Buquet)
+
+telepathy-gabble 0.18.3 (2014-05-07)
+====================================
+
+Fixes:
+
+• fd.o #76465: fix a crash in Jingle (Guillaume)
+
+telepathy-gabble 0.18.2 (2014-03-20)
+====================================
+
+The “mithril boxing gloves” release.
+
+Fixes:
+
+• update Wocky:
+  · don't try to cancel a source ID twice, which issues a critical warning
+    in GLib 2.39
+  · fix failure to build with recent (Markdown-based) gtk-doc
+
+• plugin loader: don't crash if g_dir_open() fails twice (fd.o #66085, Will)
+
+• fix a crash in 1-1 Tubes on 64-bit machines (fd.o #70038, Guillaume)
+
+• fix enum cast warnings under clang (fd.o #70038, Guillaume)
+
+• add a regression test for fd.o #68829 (Simon)
+
 telepathy-gabble 0.18.1 (2013-09-06)
 ====================================
 

src/capabilities.c

@@ -53,6 +53,7 @@ static const Feature self_advertised_features[] =
   { FEATURE_FIXED, NS_JINGLE032 },
 #endif
 
+  { FEATURE_FIXED, NS_DISCO_INFO },
   { FEATURE_FIXED, NS_CHAT_STATES },
   { FEATURE_FIXED, NS_NICK },
   { FEATURE_FIXED, NS_NICK "+notify" },

src/ft-manager.c

@@ -20,7 +20,7 @@
 
 #include "config.h"
 
-#define _BSD_SOURCE
+#define _DEFAULT_SOURCE
 #define _XOPEN_SOURCE /* glibc2 needs this */
 #include <time.h>
 #include <dbus/dbus-glib.h>