diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-04-13 12:56:07 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-04-13 12:56:07 +0100 |
| commit | 13a33ce1628ced2b54370dce06dabc5940efdd34 (patch) | |
| tree | f28194af9a0027cdfd081b9de0f205ce07f5f887 | |
| parent | 2d2991d46fa150f38ac2a5090c45d64b5346391d (diff) | |
| parent | 66d1a078e9d52791ad53db2ce7a94e817e86d12e (diff) | |
| download | telepathy-glib-13a33ce1628ced2b54370dce06dabc5940efdd34.tar.gz | |
Merge branch 'telepathy-glib-0.18', rejecting non-fatal g-ir-scanner warnings
Conflicts:
NEWS
| -rw-r--r-- | NEWS | 6 | ||||
| -rw-r--r-- | tools/c-constants-gen.py | 3 |
2 files changed, 6 insertions, 3 deletions
@@ -26,7 +26,11 @@ Fixes: • Make several methods returning a GStrv introspectable (fd.o #46471, Simon) -• Fix warnings with newer gtk-doc and g-ir-scanner (fd.o #48592, Stef Walter) +• Fix warnings with newer gtk-doc and g-ir-scanner (fd.o #48592, fd.o #48363, + fd.o #48620; Stef Walter, Alban Browaeys) + +• Don't hard-code use of a particular abstract socket in dbus-tube-chan test, + fixing test failure on non-Linux (fd.o #48600, Simon) telepathy-glib 0.18.0 (2012-04-02) ================================== diff --git a/tools/c-constants-gen.py b/tools/c-constants-gen.py index 12c43f2ad..c7a93d371 100644 --- a/tools/c-constants-gen.py +++ b/tools/c-constants-gen.py @@ -101,8 +101,7 @@ extern "C" { enum.getAttribute('name') + 's' self.d("""\ /** - * -%s: + * %s: """ % (self.prefix + name).replace('_', '')) vals = get_by_path(enum, 'enumvalue') for val in vals: |