diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-04-12 13:33:01 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-04-12 13:33:01 +0100 |
| commit | 9f15b9669e02238c3efee3471d5a6f2398559d04 (patch) | |
| tree | 3ceff7570df8570e5798d593aaea6f30f71410cc | |
| parent | be03dcdf3e6f1e89a4ec226a14d88e0a2d339adc (diff) | |
| parent | 3302343b9dbe8246e1fda0d75db2145d8a9520bd (diff) | |
| download | telepathy-glib-9f15b9669e02238c3efee3471d5a6f2398559d04.tar.gz | |
Merge branch 'telepathy-glib-0.18', rejecting 0.18-specific changes
Conflicts:
NEWS
telepathy-glib/base-connection.c
telepathy-glib/dbus-properties-mixin.c
telepathy-glib/presence-mixin.c
tools/c-constants-gen.py
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | tools/glib-gtypes-generator.py | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -26,6 +26,8 @@ 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) + telepathy-glib 0.18.0 (2012-04-02) ================================== diff --git a/tools/glib-gtypes-generator.py b/tools/glib-gtypes-generator.py index e5e62904a..21dfc6aa7 100644 --- a/tools/glib-gtypes-generator.py +++ b/tools/glib-gtypes-generator.py @@ -91,7 +91,7 @@ class GTypesGenerator(object): docstring = get_docstring(mapping) or '(Undocumented)' - self.d('/**\n * %s:\n *\n' % name) + self.d('/**\n * %s:\n *\n' % name.strip()) self.d(' * %s\n' % xml_escape(docstring)) self.d(' *\n') self.d(' * This macro expands to a call to a function\n') |