summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSébastien Wilmet <swilmet@gnome.org>2014-04-21 14:50:53 +0200
committerSébastien Wilmet <swilmet@gnome.org>2014-05-09 18:47:42 +0200
commit430e6fd6ad4ecf68ca110e90a626a60fd5d4eca8 (patch)
treeadc63e7841699ebf8b260592589eb9eb230a9e4e
parent7c205ae90d5ee1dc583b20548fcb65a231af48ff (diff)
doc: various improvements
- GSubprocessLauncher exists since 2.40, not 2.36 - more logical order for g_markup functions - fix short description of GMarkup - GMarkupParser: specify that some parameters are NULL-terminated. - g_string_new (NULL); is possible. - other trivial fixes. https://bugzilla.gnome.org/show_bug.cgi?id=728983
-rw-r--r--docs/reference/glib/glib-sections.txt4
-rw-r--r--gio/giotypes.h2
-rw-r--r--glib/gmarkup.c3
-rw-r--r--glib/gmarkup.h3
-rw-r--r--glib/gstring.c3
-rw-r--r--gobject/gsignal.c4
6 files changed, 11 insertions, 8 deletions
diff --git a/docs/reference/glib/glib-sections.txt b/docs/reference/glib/glib-sections.txt
index e8a0fa2af..19eda5c58 100644
--- a/docs/reference/glib/glib-sections.txt
+++ b/docs/reference/glib/glib-sections.txt
@@ -1128,14 +1128,14 @@ GMarkupParser
g_markup_escape_text
g_markup_printf_escaped
g_markup_vprintf_escaped
+g_markup_parse_context_new
+g_markup_parse_context_parse
g_markup_parse_context_end_parse
g_markup_parse_context_free
g_markup_parse_context_get_position
g_markup_parse_context_get_element
g_markup_parse_context_get_element_stack
g_markup_parse_context_get_user_data
-g_markup_parse_context_new
-g_markup_parse_context_parse
g_markup_parse_context_push
g_markup_parse_context_pop
g_markup_parse_context_ref
diff --git a/gio/giotypes.h b/gio/giotypes.h
index 0c5df22a4..de62cefa2 100644
--- a/gio/giotypes.h
+++ b/gio/giotypes.h
@@ -526,7 +526,7 @@ typedef struct _GSubprocess GSubprocess;
*
* Options for launching a child process.
*
- * Since: 2.36
+ * Since: 2.40
*/
typedef struct _GSubprocessLauncher GSubprocessLauncher;
diff --git a/glib/gmarkup.c b/glib/gmarkup.c
index 390a23bfc..9b60387cd 100644
--- a/glib/gmarkup.c
+++ b/glib/gmarkup.c
@@ -39,7 +39,8 @@
/**
* SECTION:markup
- * @Title: Simple XML Subset Parser * @Short_description: parses a subset of XML
+ * @Title: Simple XML Subset Parser
+ * @Short_description: parses a subset of XML
* @See_also: [XML Specification](http://www.w3.org/TR/REC-xml/)
*
* The "GMarkup" parser is intended to parse a simple markup format
diff --git a/glib/gmarkup.h b/glib/gmarkup.h
index 71ff6aa30..13b2343a7 100644
--- a/glib/gmarkup.h
+++ b/glib/gmarkup.h
@@ -116,7 +116,8 @@ typedef struct _GMarkupParser GMarkupParser;
/**
* GMarkupParser:
* @start_element: Callback to invoke when the opening tag of an element
- * is seen.
+ * is seen. The callback's @attribute_names and @attribute_values parameters
+ * are %NULL-terminated.
* @end_element: Callback to invoke when the closing tag of an element
* is seen. Note that this is also called for empty tags like
* `<empty/>`.
diff --git a/glib/gstring.c b/glib/gstring.c
index d9a5fdd43..f5890bf64 100644
--- a/glib/gstring.c
+++ b/glib/gstring.c
@@ -132,7 +132,8 @@ g_string_sized_new (gsize dfl_size)
/**
* g_string_new:
- * @init: the initial text to copy into the string
+ * @init: (allow-none): the initial text to copy into the string, or %NULL to
+ * start with an empty string.
*
* Creates a new #GString, initialized with the given string.
*
diff --git a/gobject/gsignal.c b/gobject/gsignal.c
index e328df87e..c81a041ca 100644
--- a/gobject/gsignal.c
+++ b/gobject/gsignal.c
@@ -1436,7 +1436,7 @@ g_signal_new (const gchar *signal_name,
*
* See g_signal_new() for information about signal names.
*
- * If c_marshaller is %NULL @g_cclosure_marshal_generic will be used as
+ * If c_marshaller is %NULL, g_cclosure_marshal_generic() will be used as
* the marshaller for this signal.
*
* Returns: the signal id
@@ -1564,7 +1564,7 @@ signal_add_class_closure (SignalNode *node,
*
* See g_signal_new() for details on allowed signal names.
*
- * If c_marshaller is %NULL @g_cclosure_marshal_generic will be used as
+ * If c_marshaller is %NULL, g_cclosure_marshal_generic() will be used as
* the marshaller for this signal.
*
* Returns: the signal id