diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-08-09 17:32:42 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-08-09 17:32:42 +0100 |
| commit | c189853916f271828ff82d406479934a7e9954fe (patch) | |
| tree | 58888ec3f6b581994b7bccab2802f12c73219ac2 | |
| parent | f5b1f9d7c1b6ad5c95110db6d386eaea1fc9fe06 (diff) | |
| parent | 8e27c66d058a72583579384f3dd307e798a8ba73 (diff) | |
Merge branch 'telepathy-gabble-0.18'
Conflicts:
NEWS
configure.ac
| -rw-r--r-- | NEWS | 8 | ||||
| m--------- | lib/ext/wocky | 0 | ||||
| -rw-r--r-- | src/media-stream.h | 2 | ||||
| -rw-r--r-- | tests/twisted/Makefile.am | 3 |
4 files changed, 10 insertions, 3 deletions
@@ -3,9 +3,11 @@ telepathy-gabble 0.19.0 (UNRELEASED) … -telepathy-gabble 0.18.0 (UNRELEASED) +telepathy-gabble 0.18.0 (2013-08-09) ==================================== +The “sea view over the steelworks” release. + This is a new stable branch, recommended for use with GNOME 3.10. Summary of changes since 0.16.x: @@ -36,6 +38,10 @@ Fixes since 0.17.6: • fd.o #67828: fix a test failure with telepathy-glib 0.20.3/0.21.1 or later (Simon) +• Debian #714534: avoid naming a function parameter "errno", which + is technically a reserved word and might be a macro expanding to an + lvalue expression (Samuel Thibault) + telepathy-gabble 0.17.5 (2013-06-06) ==================================== diff --git a/lib/ext/wocky b/lib/ext/wocky -Subproject 8a21c43636459138bac752ed87329ef086ba9bc +Subproject d7b1e68d8ef5249d3bce5de45d4fb882c399435 diff --git a/src/media-stream.h b/src/media-stream.h index 2174f52df..0fb3504cb 100644 --- a/src/media-stream.h +++ b/src/media-stream.h @@ -86,7 +86,7 @@ GType gabble_media_stream_get_type (void); #define MAKE_COMBINED_DIRECTION(d, p) \ ((CombinedStreamDirection) ((d) | ((p) << 2))) -gboolean gabble_media_stream_error (GabbleMediaStream *self, guint errno, +gboolean gabble_media_stream_error (GabbleMediaStream *self, guint errnum, const gchar *message, GError **error); void gabble_media_stream_close (GabbleMediaStream *close); diff --git a/tests/twisted/Makefile.am b/tests/twisted/Makefile.am index 37f732674..ef429bb29 100644 --- a/tests/twisted/Makefile.am +++ b/tests/twisted/Makefile.am @@ -464,7 +464,8 @@ tools/exec-with-log.sh: tools/exec-with-log.sh.in # The wildcard % matches both config files! tools/%.conf: tools/%.conf.in Makefile - $(MKDIR_P) tools + $(MKDIR_P) tools/servicedir + $(MKDIR_P) tools/servicedir-uninstalled $(AM_V_GEN)sed -e "s|[@]gabbletestsdir[@]|@gabbletestsdir@|g" \ -e "s|[@]abs_top_builddir[@]|@abs_top_builddir@|g" $< > $@ |