From ce7f1a07890e081675f1522595e7a1b519bb6f5e Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Tue, 3 Apr 2012 10:56:29 +0200 Subject: [PATCH] Fix malformed GTK-Doc comment blocks: don't confuse GTK-Doc parsers. Found these thanks to the improved gobject-introspection GTK-Doc comment block/annotation parser. See https://bugzilla.gnome.org/show_bug.cgi?id=672254 https://bugzilla.gnome.org/show_bug.cgi?id=673385 --- gio/gdbusmessage.c | 26 +++++++++++++------------- glib/giochannel.c | 2 +- gobject/gparam.h | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/gio/gdbusmessage.c b/gio/gdbusmessage.c index ca7f6c5..01dc3c3 100644 --- a/gio/gdbusmessage.c +++ b/gio/gdbusmessage.c @@ -3020,32 +3020,32 @@ _sort_keys_func (gconstpointer a, * and formatting is subject to change at any time. Typical output * looks something like this: * - * Type: method-call - * Flags: none - * Version: 0 - * Serial: 4 - * Headers: + * Type: method-call + * Flags: none + * Version: 0 + * Serial: 4 + * Headers: * path -> objectpath '/org/gtk/GDBus/TestObject' * interface -> 'org.gtk.GDBus.TestInterface' * member -> 'GimmeStdout' * destination -> ':1.146' - * Body: () + * Body: () * UNIX File Descriptors: * (none) * * or * - * Type: method-return - * Flags: no-reply-expected - * Version: 0 - * Serial: 477 - * Headers: + * Type: method-return + * Flags: no-reply-expected + * Version: 0 + * Serial: 477 + * Headers: * reply-serial -> uint32 4 * destination -> ':1.159' * sender -> ':1.146' * num-unix-fds -> uint32 1 - * Body: () - * UNIX File Descriptors: + * Body: () + * UNIX File Descriptors: * fd 12: dev=0:10,mode=020620,ino=5,uid=500,gid=5,rdev=136:2,size=0,atime=1273085037,mtime=1273085851,ctime=1272982635 * * diff --git a/glib/giochannel.c b/glib/giochannel.c index ee9eea2..32099f7 100644 --- a/glib/giochannel.c +++ b/glib/giochannel.c @@ -116,7 +116,7 @@ * various functions such as g_io_channel_write_chars() to * write raw bytes to the channel. Encoding and buffering * issues are dealt with at a higher level. - * @io_seek: (optional) seeks the channel. This is called from + * @io_seek: (optional) seeks the channel. This is called from * g_io_channel_seek() on channels that support it. * @io_close: closes the channel. This is called from * g_io_channel_close() after flushing the buffers. diff --git a/gobject/gparam.h b/gobject/gparam.h index 8357477..84b3c44 100644 --- a/gobject/gparam.h +++ b/gobject/gparam.h @@ -135,7 +135,7 @@ G_BEGIN_DECLS * @G_PARAM_DEPRECATED: the parameter is deprecated and will be removed * in a future version. A warning will be generated if it is used * while running with G_ENABLE_DIAGNOSTIC=1. - * Since: 2.26 + * Since 2.26 * * Through the #GParamFlags flag values, certain aspects of parameters * can be configured. -- 2.7.4