[glibmm] One more regeneration of docs to avoid gmmproc parsing errors.
- From: José Alburquerque <jaalburqu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glibmm] One more regeneration of docs to avoid gmmproc parsing errors.
- Date: Tue, 13 Apr 2010 17:58:18 +0000 (UTC)
commit a5c1cfd946107af2b4b63e5c04b71167a10d3c39
Author: José Alburquerque <jaalburqu svn gnome org>
Date: Tue Apr 13 13:57:47 2010 -0400
One more regeneration of docs to avoid gmmproc parsing errors.
* gio/src/gio_docs.xml:
* glib/src/glib_docs.xml: Regenerated with a fixed
docextract_to_xml.py script to avoid parsing errors by &...;
expressions that gmmproc does not understand.
ChangeLog | 9 +++++++++
gio/src/gio_docs.xml | 10 +++++-----
glib/src/glib_docs.xml | 46 +++++++++++++++++++++++-----------------------
3 files changed, 37 insertions(+), 28 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 01be2e7..6563d0f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-04-13 José Alburquerque <jaalburqu svn gnome org>
+
+ One more regeneration of docs to avoid gmmproc parsing errors.
+
+ * gio/src/gio_docs.xml:
+ * glib/src/glib_docs.xml: Regenerated with a fixed
+ docextract_to_xml.py script to avoid parsing errors by &...;
+ expressions that gmmproc does not understand.
+
2010-04-12 Armin Burgmeier <armin arbur net>
* examples/compose/main.cc: Don't use ustring::format with std::fixed
diff --git a/gio/src/gio_docs.xml b/gio/src/gio_docs.xml
index c350749..6aa36fa 100644
--- a/gio/src/gio_docs.xml
+++ b/gio/src/gio_docs.xml
@@ -11342,9 +11342,9 @@ GMount *mount;
GFile *mount_root
GFile *volume_activation_root;
-mount = g_volume_get_mount (volume); /* mounted, so never NULL */
+mount = g_volume_get_mount (volume); / * mounted, so never NULL * /
mount_root = g_mount_get_root (mount);
-volume_activation_root = g_volume_get_activation_root(volume); /* assume not NULL */
+volume_activation_root = g_volume_get_activation_root(volume); / * assume not NULL * /
</programlisting>
then the expression
@@ -19121,13 +19121,13 @@ storage when necessary. To construct a fixed-size output stream,
pass %NULL as @realloc_fn.
|[
-/* a stream that can grow */
+/ * a stream that can grow * /
stream = g_memory_output_stream_new (NULL, 0, realloc, free);
-/* another stream that can grow */
+/ * another stream that can grow * /
stream2 = g_memory_output_stream_new (NULL, 0, g_realloc, g_free);
-/* a fixed-size stream */
+/ * a fixed-size stream * /
data = malloc (200);
stream3 = g_memory_output_stream_new (data, 200, NULL, free);
]|
diff --git a/glib/src/glib_docs.xml b/glib/src/glib_docs.xml
index 0920957..6204904 100644
--- a/glib/src/glib_docs.xml
+++ b/glib/src/glib_docs.xml
@@ -687,7 +687,7 @@ may have changed, so make sure you store the new value.
</para></note>
|[
-/* Notice that it is initialized to the empty list. */
+/ * Notice that it is initialized to the empty list. * /
GSList *list = NULL;
list = g_slist_prepend (list, "last");
list = g_slist_prepend (list, "first");
@@ -1358,7 +1358,7 @@ gpointer key, value;
g_hash_table_iter_init (&iter, hash_table);
while (g_hash_table_iter_next (&iter, &key, &value))
{
-/* do something with key and value */
+/ * do something with key and value * /
}
]|
@@ -1679,7 +1679,7 @@ might themselves contain markup.
const char *store = "Fortnum & Mason";
const char *item = "Tea";
char *output;
-
+
output = g_markup_printf_escaped ("<purchase>"
"<store>%s</store>"
"<item>%s</item>"
@@ -5158,7 +5158,7 @@ static void start_element (context, element_name, ...)
if (strcmp (element_name, "count-these") == 0)
start_counting (context);
-/* else, handle other tags... */
+/ * else, handle other tags... * /
}
static void end_element (context, element_name, ...)
@@ -5166,7 +5166,7 @@ static void end_element (context, element_name, ...)
if (strcmp (element_name, "count-these") == 0)
g_print ("Counted %d tags\n", end_counting (context));
-/* else, handle other tags... */
+/ * else, handle other tags... * /
}
]|
@@ -6345,10 +6345,10 @@ string you can use g_match_info_next().
static void
print_uppercase_words (const gchar *string)
{
-/* Print all uppercase-only words. */
+/ * Print all uppercase-only words. * /
GRegex *regex;
GMatchInfo *match_info;
-
+
regex = g_regex_new ("[A-Z]+", 0, 0, NULL);
g_regex_match (regex, string, 0, &match_info);
while (g_match_info_matches (match_info))
@@ -9702,11 +9702,11 @@ string you can use g_match_info_next().
static void
print_uppercase_words (const gchar *string)
{
-/* Print all uppercase-only words. */
+/ * Print all uppercase-only words. * /
GRegex *regex;
GMatchInfo *match_info;
GError *error = NULL;
-
+
regex = g_regex_new ("[A-Z]+", 0, 0, NULL);
g_regex_match_full (regex, string, -1, 0, 0, &match_info, &error);
while (g_match_info_matches (match_info))
@@ -13162,7 +13162,7 @@ if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDOUT | G_TEST_TRAP_SILENCE_STDERR
{
g_print ("some stdout text: somagic17\n");
g_printerr ("some stderr text: semagic43\n");
-exit (0); /* successful test run */
+exit (0); / * successful test run * /
}
g_test_trap_assert_passed();
g_test_trap_assert_stdout ("*somagic17*");
@@ -16483,14 +16483,14 @@ the elements and reverse the list when all elements have been added.
</para></note>
|[
-/* Notice that these are initialized to the empty list. */
+/ * Notice that these are initialized to the empty list. * /
GSList *list = NULL, *number_list = NULL;
-/* This is a list of strings. */
+/ * This is a list of strings. * /
list = g_slist_append (list, "first");
list = g_slist_append (list, "second");
-/* This is a list of integers. */
+/ * This is a list of integers. * /
number_list = g_slist_append (number_list, GINT_TO_POINTER (27));
number_list = g_slist_append (number_list, GINT_TO_POINTER (14));
]|
@@ -18770,11 +18770,11 @@ For example, you might think you could use %G_FILE_TEST_IS_SYMLINK
to know whether it is safe to write to a file without being
tricked into writing into a different location. It doesn't work!
|[
-/* DON'T DO THIS */
+/ * DON'T DO THIS * /
if (!g_file_test (filename, G_FILE_TEST_IS_SYMLINK))
{
fd = g_open (filename, O_WRONLY);
-/* write to fd */
+/ * write to fd * /
}
]|
@@ -28113,7 +28113,7 @@ may have changed, so make sure you store the new value.
</para></note>
|[
-/* Notice that it is initialized to the empty list. */
+/ * Notice that it is initialized to the empty list. * /
GList *list = NULL;
list = g_list_prepend (list, "last");
list = g_list_prepend (list, "first");
@@ -33325,8 +33325,8 @@ The original intended use of @package was for a short identifier of
the package, typically the same identifier as used for
<literal>GETTEXT_PACKAGE</literal> in software configured using GNU
autotools. The function first looks in the Windows Registry for the
-value <literal>#InstallationDirectory</literal> in the key
-<literal>#HKLM\Software\ package</literal>, and if that value
+value <literal>InstallationDirectory</literal> in the key
+<literal>HKLM\Software\ package</literal>, and if that value
exists and is a string, returns that.
It is strongly recommended that packagers of GLib-using libraries
@@ -34382,14 +34382,14 @@ the elements and reverse the list when all elements have been added.
</para></note>
|[
-/* Notice that these are initialized to the empty list. */
+/ * Notice that these are initialized to the empty list. * /
GList *list = NULL, *number_list = NULL;
-/* This is a list of strings. */
+/ * This is a list of strings. * /
list = g_list_append (list, "first");
list = g_list_append (list, "second");
-/* This is a list of integers. */
+/ * This is a list of integers. * /
number_list = g_list_append (number_list, GINT_TO_POINTER (27));
number_list = g_list_append (number_list, GINT_TO_POINTER (14));
]|
@@ -35407,7 +35407,7 @@ g_free (match);
return FALSE;
}
-/* ... */
+/ * ... * /
GRegex *reg;
GHashTable *h;
@@ -35424,7 +35424,7 @@ reg = g_regex_new ("1|2|3|4", 0, 0, NULL);
res = g_regex_replace_eval (reg, text, -1, 0, 0, eval_cb, h, NULL);
g_hash_table_destroy (h);
-/* ... */
+/ * ... * /
]|
Since: 2.14
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
