Skip to content
Browse files

2.18.2

svn path=/branches/glib-2-18/; revision=7608
  • Loading branch information...
1 parent 61f82f5 commit c1281a03753635eba0a8a9cb4f5783571089b419 Matthias Clasen committed Oct 16, 2008
Sorry, we could not display the entire diff because it was too big.
View
4 ChangeLog
@@ -1,5 +1,9 @@
2008-10-16 Matthias Clasen <mclasen@redhat.com>
+ * === Released 2.18.2 ===
+
+2008-10-16 Matthias Clasen <mclasen@redhat.com>
+
* NEWS: Updates
2008-10-08 Christian Persch <chpe@gnome.org>
View
4 INSTALL
@@ -1,8 +1,8 @@
Simple install procedure
========================
- % gzip -cd glib-2.18.1.tar.gz | tar xvf - # unpack the sources
- % cd glib-2.18.1 # change to the toplevel directory
+ % gzip -cd glib-2.18.2.tar.gz | tar xvf - # unpack the sources
+ % cd glib-2.18.2 # change to the toplevel directory
% ./configure # run the `configure' script
% make # build GLIB
View
2 README
@@ -1,7 +1,7 @@
General Information
===================
-This is GLib version 2.18.1. GLib is the low-level core
+This is GLib version 2.18.2. GLib is the low-level core
library that forms the basis for projects such as GTK+ and GNOME. It
provides data structure handling for C, portability wrappers, and
interfaces for such runtime functionality as an event loop, threads,
View
4 docs/reference/ChangeLog
@@ -1,5 +1,9 @@
2008-10-16 Matthias Clasen <mclasen@redhat.com>
+ * === Released 2.18.2 ===
+
+2008-10-16 Matthias Clasen <mclasen@redhat.com>
+
* glib/Makefile.am: Don't specify multiple directories in
DOC_SOURCE_DIR. It doesn't work.
View
189 docs/reference/glib/tmpl/byte_order.sgml
@@ -52,6 +52,15 @@ side-effects.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### MACRO G_BYTE_ORDER ##### -->
+<para>
+The host byte order.
+This can be either #G_LITTLE_ENDIAN or #G_BIG_ENDIAN (support for
+#G_PDP_ENDIAN may be added in future.)
+</para>
+
+
+
<!-- ##### MACRO G_LITTLE_ENDIAN ##### -->
<para>
Specifies one of the possible types of byte order.
@@ -130,6 +139,24 @@ Converts a #gint value from little-endian to host byte order.
@Returns: @val converted to host byte order.
+<!-- ##### MACRO GINT_TO_BE ##### -->
+<para>
+Converts a #gint value from host byte order to big-endian.
+</para>
+
+@val: a #gint value in host byte order.
+@Returns: @val converted to big-endian byte order.
+
+
+<!-- ##### MACRO GINT_TO_LE ##### -->
+<para>
+Converts a #gint value from host byte order to little-endian.
+</para>
+
+@val: a #gint value in host byte order.
+@Returns: @val converted to little-endian byte order.
+
+
<!-- ##### MACRO GUINT_FROM_BE ##### -->
<para>
Converts a #guint value from big-endian to host byte order.
@@ -148,6 +175,24 @@ Converts a #guint value from little-endian to host byte order.
@Returns: @val converted to host byte order.
+<!-- ##### MACRO GUINT_TO_BE ##### -->
+<para>
+Converts a #guint value from host byte order to big-endian.
+</para>
+
+@val: a #guint value in host byte order.
+@Returns: @val converted to big-endian byte order.
+
+
+<!-- ##### MACRO GUINT_TO_LE ##### -->
+<para>
+Converts a #guint value from host byte order to little-endian.
+</para>
+
+@val: a #guint value in host byte order.
+@Returns: @val converted to little-endian byte order.
+
+
<!-- ##### MACRO GLONG_FROM_BE ##### -->
<para>
Converts a #glong value from big-endian to the host byte order.
@@ -166,6 +211,24 @@ Converts a #glong value from little-endian to host byte order.
@Returns: @val converted to host byte order.
+<!-- ##### MACRO GLONG_TO_BE ##### -->
+<para>
+Converts a #glong value from host byte order to big-endian.
+</para>
+
+@val: a #glong value in host byte order.
+@Returns: @val converted to big-endian byte order.
+
+
+<!-- ##### MACRO GLONG_TO_LE ##### -->
+<para>
+Converts a #glong value from host byte order to little-endian.
+</para>
+
+@val: a #glong value in host byte order.
+@Returns: @val converted to little-endian.
+
+
<!-- ##### MACRO GULONG_FROM_BE ##### -->
<para>
Converts a #gulong value from big-endian to host byte order.
@@ -184,6 +247,24 @@ Converts a #gulong value from little-endian to host byte order.
@Returns: @val converted to host byte order.
+<!-- ##### MACRO GULONG_TO_BE ##### -->
+<para>
+Converts a #gulong value from host byte order to big-endian.
+</para>
+
+@val: a #gulong value in host byte order.
+@Returns: @val converted to big-endian.
+
+
+<!-- ##### MACRO GULONG_TO_LE ##### -->
+<para>
+Converts a #gulong value from host byte order to little-endian.
+</para>
+
+@val: a #gulong value in host byte order.
+@Returns: @val converted to little-endian.
+
+
<!-- ##### MACRO GINT16_FROM_BE ##### -->
<para>
Converts a #gint16 value from big-endian to host byte order.
@@ -202,6 +283,24 @@ Converts a #gint16 value from little-endian to host byte order.
@Returns: @val converted to host byte order.
+<!-- ##### MACRO GINT16_TO_BE ##### -->
+<para>
+Converts a #gint16 value from host byte order to big-endian.
+</para>
+
+@val: a #gint16 value in host byte order.
+@Returns: @val converted to big-endian.
+
+
+<!-- ##### MACRO GINT16_TO_LE ##### -->
+<para>
+Converts a #gint16 value from host byte order to little-endian.
+</para>
+
+@val: a #gint16 value in host byte order.
+@Returns: @val converted to little-endian.
+
+
<!-- ##### MACRO GUINT16_FROM_BE ##### -->
<para>
Converts a #guint16 value from big-endian to host byte order.
@@ -220,6 +319,24 @@ Converts a #guint16 value from little-endian to host byte order.
@Returns: @val converted to host byte order.
+<!-- ##### MACRO GUINT16_TO_BE ##### -->
+<para>
+Converts a #guint16 value from host byte order to big-endian.
+</para>
+
+@val: a #guint16 value in host byte order.
+@Returns: @val converted to big-endian.
+
+
+<!-- ##### MACRO GUINT16_TO_LE ##### -->
+<para>
+Converts a #guint16 value from host byte order to little-endian.
+</para>
+
+@val: a #guint16 value in host byte order.
+@Returns: @val converted to little-endian.
+
+
<!-- ##### MACRO GINT32_FROM_BE ##### -->
<para>
Converts a #gint32 value from big-endian to host byte order.
@@ -238,6 +355,24 @@ Converts a #gint32 value from little-endian to host byte order.
@Returns: @val converted to host byte order.
+<!-- ##### MACRO GINT32_TO_BE ##### -->
+<para>
+Converts a #gint32 value from host byte order to big-endian.
+</para>
+
+@val: a #gint32 value in host byte order.
+@Returns: @val converted to big-endian.
+
+
+<!-- ##### MACRO GINT32_TO_LE ##### -->
+<para>
+Converts a #gint32 value from host byte order to little-endian.
+</para>
+
+@val: a #gint32 value in host byte order.
+@Returns: @val converted to little-endian.
+
+
<!-- ##### MACRO GUINT32_FROM_BE ##### -->
<para>
Converts a #guint32 value from big-endian to host byte order.
@@ -256,6 +391,24 @@ Converts a #guint32 value from little-endian to host byte order.
@Returns: @val converted to host byte order.
+<!-- ##### MACRO GUINT32_TO_BE ##### -->
+<para>
+Converts a #guint32 value from host byte order to big-endian.
+</para>
+
+@val: a #guint32 value in host byte order.
+@Returns: @val converted to big-endian.
+
+
+<!-- ##### MACRO GUINT32_TO_LE ##### -->
+<para>
+Converts a #guint32 value from host byte order to little-endian.
+</para>
+
+@val: a #guint32 value in host byte order.
+@Returns: @val converted to little-endian.
+
+
<!-- ##### MACRO GINT64_FROM_BE ##### -->
<para>
Converts a #gint64 value from big-endian to host byte order.
@@ -274,6 +427,24 @@ Converts a #gint64 value from little-endian to host byte order.
@Returns: @val converted to host byte order.
+<!-- ##### MACRO GINT64_TO_BE ##### -->
+<para>
+Converts a #gint64 value from host byte order to big-endian.
+</para>
+
+@val: a #gint64 value in host byte order.
+@Returns: @val converted to big-endian.
+
+
+<!-- ##### MACRO GINT64_TO_LE ##### -->
+<para>
+Converts a #gint64 value from host byte order to little-endian.
+</para>
+
+@val: a #gint64 value in host byte order.
+@Returns: @val converted to little-endian.
+
+
<!-- ##### MACRO GUINT64_FROM_BE ##### -->
<para>
Converts a #guint64 value from big-endian to host byte order.
@@ -292,6 +463,24 @@ Converts a #guint64 value from little-endian to host byte order.
@Returns: @val converted to host byte order.
+<!-- ##### MACRO GUINT64_TO_BE ##### -->
+<para>
+Converts a #guint64 value from host byte order to big-endian.
+</para>
+
+@val: a #guint64 value in host byte order.
+@Returns: @val converted to big-endian.
+
+
+<!-- ##### MACRO GUINT64_TO_LE ##### -->
+<para>
+Converts a #guint64 value from host byte order to little-endian.
+</para>
+
+@val: a #guint64 value in host byte order.
+@Returns: @val converted to little-endian.
+
+
<!-- ##### MACRO GUINT16_SWAP_BE_PDP ##### -->
<para>
Converts a #guint16 value between big-endian and pdp-endian byte order.
View
838 docs/reference/glib/tmpl/glib-unused.sgml
@@ -180,83 +180,6 @@ Specifies the type of function passed to g_set_error_handler().
@hook_list:
@hook:
-<!-- ##### MACRO GINT16_TO_BE ##### -->
-<para>
-Converts a #gint16 value from host byte order to big-endian.
-</para>
-
-@val: a #gint16 value in host byte order.
-@Returns: @val converted to big-endian.
-
-<!-- ##### MACRO GINT16_TO_LE ##### -->
-<para>
-Converts a #gint16 value from host byte order to little-endian.
-</para>
-
-@val: a #gint16 value in host byte order.
-@Returns: @val converted to little-endian.
-
-<!-- ##### MACRO GINT32_TO_BE ##### -->
-<para>
-Converts a #gint32 value from host byte order to big-endian.
-</para>
-
-@val: a #gint32 value in host byte order.
-@Returns: @val converted to big-endian.
-
-<!-- ##### MACRO GINT32_TO_LE ##### -->
-<para>
-Converts a #gint32 value from host byte order to little-endian.
-</para>
-
-@val: a #gint32 value in host byte order.
-@Returns: @val converted to little-endian.
-
-<!-- ##### MACRO GINT64_TO_BE ##### -->
-<para>
-Converts a #gint64 value from host byte order to big-endian.
-</para>
-
-@val: a #gint64 value in host byte order.
-@Returns: @val converted to big-endian.
-
-<!-- ##### MACRO GINT64_TO_LE ##### -->
-<para>
-Converts a #gint64 value from host byte order to little-endian.
-</para>
-
-@val: a #gint64 value in host byte order.
-@Returns: @val converted to little-endian.
-
-<!-- ##### MACRO GINT_TO_BE ##### -->
-<para>
-Converts a #gint value from host byte order to big-endian.
-</para>
-
-@val: a #gint value in host byte order.
-@Returns: @val converted to big-endian byte order.
-
-<!-- ##### MACRO GINT_TO_LE ##### -->
-<para>
-Converts a #gint value from host byte order to little-endian.
-</para>
-
-@val: a #gint value in host byte order.
-@Returns: @val converted to little-endian byte order.
-
-<!-- ##### MACRO GINT_TO_POINTER ##### -->
-<para>
-Stuffs an integer into a pointer type.
-</para>
-<para>
-Remember, YOU MAY NOT STORE POINTERS IN INTEGERS. THIS IS NOT PORTABLE
-IN ANY WAY SHAPE OR FORM. These macros <emphasis>ONLY</emphasis> allow
-storing integers in pointers, and only preserve 32 bits of the
-integer; values outside the range of a 32-bit integer will be mangled.
-</para>
-
-@i: integer to stuff into a pointer.
-
<!-- ##### ENUM GIOFileMode ##### -->
<para>
@@ -269,49 +192,6 @@ integer; values outside the range of a 32-bit integer will be mangled.
@G_IO_FILE_MODE_READ_WRITE_TRUNCATE:
@G_IO_FILE_MODE_READ_WRITE_APPEND:
-<!-- ##### MACRO GLIB_MAJOR_VERSION ##### -->
-<para>
-The major version number of the GLib library.
-Like #glib_major_version, but from the headers used at
-application compile time, rather than from the library linked against
-at application run time.
-</para>
-
-
-<!-- ##### MACRO GLIB_MICRO_VERSION ##### -->
-<para>
-The micro version number of the GLib library.
-Like #gtk_micro_version, but from the headers used at
-application compile time, rather than from the library linked against
-at application run time.
-</para>
-
-
-<!-- ##### MACRO GLIB_MINOR_VERSION ##### -->
-<para>
-The minor version number of the GLib library.
-Like #gtk_minor_version, but from the headers used at
-application compile time, rather than from the library linked against
-at application run time.
-</para>
-
-
-<!-- ##### MACRO GLONG_TO_BE ##### -->
-<para>
-Converts a #glong value from host byte order to big-endian.
-</para>
-
-@val: a #glong value in host byte order.
-@Returns: @val converted to big-endian byte order.
-
-<!-- ##### MACRO GLONG_TO_LE ##### -->
-<para>
-Converts a #glong value from host byte order to little-endian.
-</para>
-
-@val: a #glong value in host byte order.
-@Returns: @val converted to little-endian.
-
<!-- ##### ENUM GMatchType ##### -->
<para>
Enumeration representing different kinds of patterns. This is only used
@@ -326,185 +206,13 @@ the end of the string.
@G_MATCH_EXACT: a pattern matching exactly one string.
@G_MATCH_LAST:
-<!-- ##### STRUCT GModule ##### -->
-<para>
-The #GModule struct is an opaque data structure to represent a
-<link linkend="glib-Dynamic-Loading-of-Modules">Dynamically-Loaded Module</link>.
-It should only be accessed via the following functions.
-</para>
-
-
-<!-- ##### USER_FUNCTION GModuleCheckInit ##### -->
-<para>
-Specifies the type of the module initialization function.
-<indexterm zone="g-module-check-init"><primary>g_module_check_init</primary></indexterm>
-If a module contains a function named g_module_check_init() it is called
-automatically when the module is loaded. It is passed the #GModule structure
-and should return %NULL on success or a string describing the initialization
-error.
-</para>
-
-@module: the #GModule corresponding to the module which has just been loaded.
-@Returns: %NULL on success, or a string describing the initialization error.
-
-<!-- ##### ENUM GModuleFlags ##### -->
-<para>
-Flags passed to g_module_open(). Note that these flags are
-not supported on all platforms.
-</para>
-
-@G_MODULE_BIND_LAZY: specifies that symbols are only resolved when needed.
- The default action is to bind all symbols when the module is loaded.
-@G_MODULE_BIND_LOCAL: specifies that symbols in the module should
- not be added to the global name space. The default action on most
- platforms is to place symbols in the module in the global name space,
- which may cause conflicts with existing symbols.
-@G_MODULE_BIND_MASK: mask for all flags.
-
-<!-- ##### USER_FUNCTION GModuleUnload ##### -->
-<para>
-<indexterm zone="g-module-unload"><primary>g_module_unload</primary></indexterm>
-Specifies the type of the module function called when it is unloaded.
-If a module contains a function named g_module_unload() it is called
-automatically when the module is unloaded.
-It is passed the #GModule structure.
-</para>
-
-@module: the #GModule about to be unloaded.
-
-<!-- ##### MACRO GPOINTER_TO_INT ##### -->
-<para>
-Extracts an integer from a pointer. The integer must have
-been stored in the pointer with GINT_TO_POINTER().
-</para>
-<para>
-Remember, YOU MAY NOT STORE POINTERS IN INTEGERS. THIS IS NOT PORTABLE
-IN ANY WAY SHAPE OR FORM. These macros <emphasis>ONLY</emphasis> allow
-storing integers in pointers, and only preserve 32 bits of the
-integer; values outside the range of a 32-bit integer will be mangled.
-</para>
-
-@p: pointer containing an integer.
-
-<!-- ##### MACRO GPOINTER_TO_UINT ##### -->
-<para>
-Extracts an unsigned integer from a pointer. The integer must have
-been stored in the pointer with GUINT_TO_POINTER().
-</para>
-
-@p: pointer to extract an unsigned integer from.
-
-<!-- ##### TYPEDEF GPid ##### -->
-<para>
-A type which is used to hold a process identification.
-On Unix, processes are identified by a process id (an
-integer), while Windows uses process handles (which are
-pointers).
-</para>
-
-
-<!-- ##### MACRO GUINT16_TO_BE ##### -->
-<para>
-Converts a #guint16 value from host byte order to big-endian.
-</para>
-
-@val: a #guint16 value in host byte order.
-@Returns: @val converted to big-endian.
-
-<!-- ##### MACRO GUINT16_TO_LE ##### -->
-<para>
-Converts a #guint16 value from host byte order to little-endian.
-</para>
-
-@val: a #guint16 value in host byte order.
-@Returns: @val converted to little-endian.
-
-<!-- ##### MACRO GUINT32_TO_BE ##### -->
-<para>
-Converts a #guint32 value from host byte order to big-endian.
-</para>
-
-@val: a #guint32 value in host byte order.
-@Returns: @val converted to big-endian.
-
-<!-- ##### MACRO GUINT32_TO_LE ##### -->
-<para>
-Converts a #guint32 value from host byte order to little-endian.
-</para>
-
-@val: a #guint32 value in host byte order.
-@Returns: @val converted to little-endian.
-
-<!-- ##### MACRO GUINT64_TO_BE ##### -->
-<para>
-Converts a #guint64 value from host byte order to big-endian.
-</para>
-
-@val: a #guint64 value in host byte order.
-@Returns: @val converted to big-endian.
-
-<!-- ##### MACRO GUINT64_TO_LE ##### -->
-<para>
-Converts a #guint64 value from host byte order to little-endian.
-</para>
-
-@val: a #guint64 value in host byte order.
-@Returns: @val converted to little-endian.
-
-<!-- ##### MACRO GUINT_TO_BE ##### -->
-<para>
-Converts a #guint value from host byte order to big-endian.
-</para>
-
-@val: a #guint value in host byte order.
-@Returns: @val converted to big-endian byte order.
-
-<!-- ##### MACRO GUINT_TO_LE ##### -->
-<para>
-Converts a #guint value from host byte order to little-endian.
-</para>
-
-@val: a #guint value in host byte order.
-@Returns: @val converted to little-endian byte order.
-
-<!-- ##### MACRO GUINT_TO_POINTER ##### -->
-<para>
-Stuffs an unsigned integer into a pointer type.
-</para>
-
-@u: unsigned integer to stuff into the pointer.
-
-<!-- ##### MACRO GULONG_TO_BE ##### -->
-<para>
-Converts a #gulong value from host byte order to big-endian.
-</para>
-
-@val: a #gulong value in host byte order.
-@Returns: @val converted to big-endian.
-
-<!-- ##### MACRO GULONG_TO_LE ##### -->
-<para>
-Converts a #gulong value from host byte order to little-endian.
-</para>
-
-@val: a #gulong value in host byte order.
-@Returns: @val converted to little-endian.
-
<!-- ##### USER_FUNCTION GWarningFunc ##### -->
<para>
Specifies the type of function passed to g_set_warning_handler().
</para>
@str: the warning message.
-<!-- ##### MACRO G_BYTE_ORDER ##### -->
-<para>
-The host byte order.
-This can be either #G_LITTLE_ENDIAN or #G_BIG_ENDIAN (support for
-#G_PDP_ENDIAN may be added in future.)
-</para>
-
-
<!-- ##### MACRO G_CHANNEL_ERROR ##### -->
<para>
@@ -519,214 +227,6 @@ error domains.
</para>
-<!-- ##### MACRO G_GINT16_FORMAT ##### -->
-<para>
-This is the platform dependent conversion specifier for scanning and
-printing values of type #gint16. It is a string literal, but doesn't
-include the percent-sign, such that you can add precision and length
-modifiers between percent-sign and conversion specifier.
-</para>
-
-<para>
-<informalexample>
-<programlisting>
-gint16 in;
-gint32 out;
-sscanf ("42", "%" G_GINT16_FORMAT, &amp;in)
-out = in * 1000;
-g_print ("%" G_GINT32_FORMAT, out);
-</programlisting>
-</informalexample>
-</para>
-
-
-<!-- ##### MACRO G_GINT16_MODIFIER ##### -->
-<para>
-The platform dependent length modifier for constructing printf() conversion
-specifiers for values of type #gint16 or #guint16. It is a string literal,
-but doesn't include the percent-sign, such that you can add precision and
-length modifiers between percent-sign and conversion specifier and append a
-conversion specifier.
-</para>
-
-<para>
-The following example prints "0x7b";
-<informalexample>
-<programlisting>
-gint16 value = 123;
-g_print ("%#" G_GINT16_MODIFIER "x", value);
-</programlisting>
-</informalexample>
-</para>
-
-@Since: 2.4
-
-<!-- ##### MACRO G_GINT32_FORMAT ##### -->
-<para>
-This is the platform dependent conversion specifier for scanning and
-printing values of type #gint32. See also #G_GINT16_FORMAT.
-</para>
-
-
-<!-- ##### MACRO G_GINT32_MODIFIER ##### -->
-<para>
-The platform dependent length modifier for constructing printf() conversion
-specifiers for values of type #gint32 or #guint32. See also #G_GINT16_MODIFIER.
-</para>
-
-@Since: 2.4
-
-<!-- ##### MACRO G_GINT64_CONSTANT ##### -->
-<para>
-This macro is used to insert 64-bit integer literals into the source code.
-</para>
-
-@val: a literal integer value, e.g. 0x1d636b02300a7aa7U.
-
-<!-- ##### MACRO G_GINT64_FORMAT ##### -->
-<para>
-This is the platform dependent conversion specifier for scanning and
-printing values of type #gint64. See also #G_GINT16_FORMAT.
-</para>
-
-<note>
-<para>
-Some platforms do not support scanning and printing 64 bit integers,
-even though the types are supported. On such platforms #G_GINT64_FORMAT
-is not defined. Note that scanf() may not support 64 bit integers, even
-if #G_GINT64_FORMAT is defined. Due to its weak error handling, scanf() is not
-recommended for parsing anyway; consider using g_strtoull() instead.
-</para>
-</note>
-
-
-<!-- ##### MACRO G_GINT64_MODIFIER ##### -->
-<para>
-The platform dependent length modifier for constructing printf() conversion
-specifiers for values of type #gint64 or #guint64. See also #G_GINT16_MODIFIER.
-</para>
-
-<note>
-<para>
-Some platforms do not support printing 64 bit integers,
-even though the types are supported. On such platforms #G_GINT64_MODIFIER
-is not defined.
-</para>
-</note>
-
-@Since: 2.4
-
-<!-- ##### MACRO G_GNUC_INTERNAL ##### -->
-<para>
-This attribute can be used for marking library functions as being used
-internally to the library only, which may allow the compiler to handle
-function calls more efficiently.
-Note that static functions do not need to be marked as internal in this way.
-See the GNU C documentation for details.
-</para>
-<para>
-When using a compiler that supports the GNU C hidden visibility attribute,
-this macro expands to <literal>__attribute__((visibility("hidden")))</literal>.
-When using the Sun Studio compiler, it expands to <literal>__hidden</literal>.
-</para>
-<para>
-Note that for portability, the attribute should be placed before the
-function declaration. While GCC allows the macro after the declaration,
-Sun Studio does not.
-</para>
-<informalexample><programlisting>
-G_GNUC_INTERNAL
-void _g_log_fallback_handler (const gchar *log_domain,
- GLogLevelFlags log_level,
- const gchar *message,
- gpointer unused_data);
-</programlisting></informalexample>
-
-Since: 2.6
-
-
-<!-- ##### MACRO G_GSIZE_FORMAT ##### -->
-<para>
-This is the platform dependent conversion specifier for scanning and
-printing values of type #gsize. See also #G_GINT16_FORMAT.
-</para>
-
-@Since: 2.6
-
-<!-- ##### MACRO G_GSIZE_MODIFIER ##### -->
-<para>
-The platform dependent length modifier for constructing printf() conversion
-specifiers for values of type #gsize or #gssize. See also #G_GINT16_MODIFIER.
-</para>
-
-@Since: 2.6
-
-<!-- ##### MACRO G_GSSIZE_FORMAT ##### -->
-<para>
-This is the platform dependent conversion specifier for scanning and
-printing values of type #gssize. See also #G_GINT16_FORMAT.
-</para>
-
-@Since: 2.6
-
-<!-- ##### MACRO G_GUINT16_FORMAT ##### -->
-<para>
-This is the platform dependent conversion specifier for scanning and
-printing values of type #guint16. See also #G_GINT16_FORMAT.
-</para>
-
-
-<!-- ##### MACRO G_GUINT32_FORMAT ##### -->
-<para>
-This is the platform dependent conversion specifier for scanning and
-printing values of type #guint32. See also #G_GINT16_FORMAT.
-</para>
-
-
-<!-- ##### MACRO G_GUINT64_CONSTANT ##### -->
-<para>
-This macro is used to insert 64-bit unsigned integer literals into the
-source code.
-</para>
-
-@val: a literal integer value, e.g. 0x1d636b02300a7aa7U.
-@Since: 2.10
-
-<!-- ##### MACRO G_GUINT64_FORMAT ##### -->
-<para>
-This is the platform dependent conversion specifier for scanning and
-printing values of type #guint64. See also #G_GINT16_FORMAT.
-</para>
-
-<note>
-<para>
-Some platforms do not support scanning and printing 64 bit integers,
-even though the types are supported. On such platforms #G_GUINT64_FORMAT
-is not defined. Note that scanf() may not support 64 bit integers, even
-if #G_GINT64_FORMAT is defined. Due to its weak error handling, scanf() is not
-recommended for parsing anyway; consider using g_strtoull() instead.
-</para>
-</note>
-
-
-<!-- ##### MACRO G_HAVE_GINT64 ##### -->
-<para>
-This macro is defined if 64-bit signed and unsigned integers are available
-on the platform.
-</para>
-
-@Deprecated: GLib requires 64-bit integer support since version 2.0, therefore
-%G_HAVE_GINT64 is <emphasis>always</emphasis> defined.
-
-<!-- ##### MACRO G_HAVE_GNUC_VISIBILITY ##### -->
-<para>
-This macro is defined as 1 if the compiler supports ELF visibility
-attributes (currently only <command>gcc</command>).
-</para>
-
-Since: 2.6
-
-
<!-- ##### MACRO G_HOOK_DEFERRED_DESTROY ##### -->
<para>
@@ -767,159 +267,6 @@ not work.
</para>
-<!-- ##### MACRO G_MAXDOUBLE ##### -->
-<para>
-The maximum value which can be held in a #gdouble.
-</para>
-
-
-<!-- ##### MACRO G_MAXFLOAT ##### -->
-<para>
-The maximum value which can be held in a #gfloat.
-</para>
-
-
-<!-- ##### MACRO G_MAXINT ##### -->
-<para>
-The maximum value which can be held in a #gint.
-</para>
-
-
-<!-- ##### MACRO G_MAXLONG ##### -->
-<para>
-The maximum value which can be held in a #glong.
-</para>
-
-
-<!-- ##### MACRO G_MAXOFFSET ##### -->
-<para>
-The maximum value which can be held in a #goffset.
-</para>
-
-
-<!-- ##### MACRO G_MAXSHORT ##### -->
-<para>
-The maximum value which can be held in a #gshort.
-</para>
-
-
-<!-- ##### MACRO G_MAXSIZE ##### -->
-<para>
-The maximum value which can be held in a #gsize.
-</para>
-
-@Since: 2.4
-
-<!-- ##### MACRO G_MAXSSIZE ##### -->
-<para>
-The maximum value which can be held in a #gssize.
-</para>
-
-@Since: 2.14
-
-<!-- ##### MACRO G_MAXUINT ##### -->
-<para>
-The maximum value which can be held in a #guint.
-</para>
-
-
-<!-- ##### MACRO G_MAXULONG ##### -->
-<para>
-The maximum value which can be held in a #gulong.
-</para>
-
-
-<!-- ##### MACRO G_MAXUSHORT ##### -->
-<para>
-The maximum value which can be held in a #gushort.
-</para>
-
-
-<!-- ##### MACRO G_MINDOUBLE ##### -->
-<para>
-The minimum positive value which can be held in a #gdouble.
-</para>
-<para>
-If you are interested in the smallest value which can be held in a #gdouble,
-use -G_MAXDOUBLE.
-</para>
-
-
-<!-- ##### MACRO G_MINFLOAT ##### -->
-<para>
-The minimum positive value which can be held in a #gfloat.
-</para>
-<para>
-If you are interested in the smallest value which can be held in a #gfloat,
-use -G_MAX_FLOAT.
-</para>
-
-
-<!-- ##### MACRO G_MININT ##### -->
-<para>
-The minimum value which can be held in a #gint.
-</para>
-
-
-<!-- ##### MACRO G_MINLONG ##### -->
-<para>
-The minimum value which can be held in a #glong.
-</para>
-
-
-<!-- ##### MACRO G_MINOFFSET ##### -->
-<para>
-The minimum value which can be held in a #goffset.
-</para>
-
-
-<!-- ##### MACRO G_MINSHORT ##### -->
-<para>
-The minimum value which can be held in a #gshort.
-</para>
-
-
-<!-- ##### MACRO G_MINSSIZE ##### -->
-<para>
-The minimum value which can be held in a #gssize.
-</para>
-
-@Since: 2.14
-
-<!-- ##### MACRO G_MODULE_EXPORT ##### -->
-<para>
-Used to declare functions exported by modules. This is a no-op on Linux and
-Unices, but when compiling for Windows, it marks a symbol to be exported from
-the library or executable being built.
-</para>
-
-
-<!-- ##### MACRO G_MODULE_IMPORT ##### -->
-<para>
-Used to declare functions imported from modules.
-</para>
-
-
-<!-- ##### MACRO G_MODULE_SUFFIX ##### -->
-<para>
-Expands to the proper shared library suffix for the current platform
-without the leading dot. For the most Unices and Linux this is "so",
-for some HP-UX versions this is "sl" and for Windows this is "dll".
-</para>
-
-
-<!-- ##### MACRO G_THREADS_ENABLED ##### -->
-
-<para>
-This macro is defined if GLib was compiled with thread support. This
-does not necessarily mean that there is a thread implementation
-available, but it does mean that the infrastructure is in place and
-that once you provide a thread implementation to g_thread_init(), GLib
-will be multi-thread safe. If #G_THREADS_ENABLED is not defined, then
-Glib is not, and cannot be, multi-thread safe.
-</para>
-
-
<!-- ##### MACRO NAME_MAX ##### -->
<para>
Provided for UNIX emulation on Windows; equivalent to UNIX macro
@@ -1406,117 +753,6 @@ To use this function you must configure glib with the flag
@mem: the memory to check.
-<!-- ##### MACRO g_memmove ##### -->
-<para>
-
-</para>
-
-@dest:
-@src:
-@len:
-
-<!-- ##### FUNCTION g_module_build_path ##### -->
-<para>
-A portable way to build the filename of a module. The platform-specific
-prefix and suffix are added to the filename, if needed, and the result is
-added to the directory, using the correct separator character.
-</para>
-<para>
-The directory should specify the directory where the module can be found.
-It can be %NULL or an empty string to indicate that the module is in a standard
-platform-specific directory, though this is not recommended since the
-wrong module may be found.
-</para>
-<para>
-For example, calling g_module_build_path() on a Linux system with a @directory
-of <filename>/lib</filename> and a @module_name of "mylibrary" will return
-<filename>/lib/libmylibrary.so</filename>. On a Windows system, using
-<filename>\Windows</filename> as the directory it will return
-<filename>\Windows\mylibrary.dll</filename>.
-</para>
-
-@directory: the directory where the module is. This can be %NULL or the empty
-string to indicate that the standard platform-specific directories will be
-used, though that is not recommended.
-@module_name: the name of the module.
-@Returns: the complete path of the module, including the standard library
-prefix and suffix. This should be freed when no longer needed.
-
-<!-- ##### FUNCTION g_module_close ##### -->
-<para>
-Closes a module.
-</para>
-
-@module: a #GModule to close.
-@Returns: %TRUE on success.
-
-<!-- ##### FUNCTION g_module_error ##### -->
-<para>
-Gets a string describing the last module error.
-</para>
-
-@Returns: a string describing the last module error.
-
-<!-- ##### FUNCTION g_module_make_resident ##### -->
-<para>
-Ensures that a module will never be unloaded.
-Any future g_module_close() calls on the module will be ignored.
-</para>
-
-@module: a #GModule to make permanently resident.
-
-<!-- ##### FUNCTION g_module_name ##### -->
-<para>
-Gets the filename from a #GModule.
-</para>
-
-@module: a #GModule.
-@Returns: the filename of the module, or "main" if the module is the main
-program itself.
-
-<!-- ##### FUNCTION g_module_open ##### -->
-<para>
-Opens a module. If the module has already been opened, its reference
-count is incremented.
-</para>
-
-<para>
-First of all g_module_open() tries to open @file_name as a module. If
-that fails and @file_name has the ".la"-suffix (and is a libtool archive)
-it tries to open the corresponding module. If that fails and it doesn't
-have the proper module suffix for the platform (#G_MODULE_SUFFIX), this
-suffix will be appended and the corresponding module will be opended. If
-that fails and @file_name doesn't have the ".la"-suffix, this suffix is
-appended and g_module_open() tries to open the corresponding module. If
-eventually that fails as well, %NULL is returned.
-</para>
-
-@file_name: the name of the file containing the module, or %NULL to obtain
- a #GModule representing the main program itself.
-@flags: the flags used for opening the module. This can be the logical
-OR of any of the #GModuleFlags.
-@Returns: a #GModule on success, or %NULL on failure.
-
-<!-- ##### FUNCTION g_module_supported ##### -->
-<para>
-Checks if modules are supported on the current platform.
-</para>
-
-@Returns: %TRUE if modules are supported.
-
-<!-- ##### FUNCTION g_module_symbol ##### -->
-<para>
-Gets a symbol pointer from a module, such as one exported by #G_MODULE_EXPORT.
-</para>
-<para>
-Note that a valid symbol can be %NULL.
-</para>
-
-@module: a #GModule.
-@symbol_name: the name of the symbol to find.
-@symbol: returns the pointer to the symbol value.
-@Returns: %TRUE on success.
-
<!-- ##### FUNCTION g_regex_error_quark ##### -->
<para>
@@ -1664,80 +900,6 @@ Turns the argument into a string literal by using the '#' stringizing operator.
</para>
-<!-- ##### TYPEDEF gint16 ##### -->
-<para>
-A signed integer guaranteed to be 16 bits on all platforms.
-Values of this type can range from -32,768 to 32,767.
-</para>
-
-
-<!-- ##### TYPEDEF gint32 ##### -->
-<para>
-A signed integer guaranteed to be 32 bits on all platforms.
-Values of this type can range from -2,147,483,648 to 2,147,483,647.
-</para>
-
-
-<!-- ##### TYPEDEF gint64 ##### -->
-<para>
-A signed integer guaranteed to be 64 bits on all platforms.
-Values of this type can range from -9,223,372,036,854,775,808 to
-9,223,372,036,854,775,807.
-</para>
-
-
-<!-- ##### TYPEDEF gint8 ##### -->
-<para>
-A signed integer guaranteed to be 8 bits on all platforms.
-Values of this type can range from -128 to 127.
-</para>
-
-
-<!-- ##### TYPEDEF goffset ##### -->
-<para>
-A signed integer type that is used for file offsets, corresponding to the
-C99 type off64_t.
-</para>
-
-Since: 2.14
-
-
-<!-- ##### TYPEDEF gsize ##### -->
-<para>
-An unsigned integer type of the result of the sizeof operator, corresponding
-to the size_t type defined in C99. This type is wide enough to hold the numeric
-value of a pointer, so it is usually 32bit wide on a 32bit platform and
-64bit wide on a 64bit platform.
-</para>
-
-
-<!-- ##### TYPEDEF gssize ##### -->
-<para>
-A signed variant of gsize, corresponding to the ssize_t defined on most platforms.
-</para>
-
-
-<!-- ##### TYPEDEF guint16 ##### -->
-<para>
-An unsigned integer guaranteed to be 16 bits on all platforms.
-Values of this type can range from 0 to 65,535.
-</para>
-
-
-<!-- ##### TYPEDEF guint32 ##### -->
-<para>
-An unsigned integer guaranteed to be 32 bits on all platforms.
-Values of this type can range from 0 to 4,294,967,295.
-</para>
-
-
-<!-- ##### TYPEDEF guint8 ##### -->
-<para>
-An unsigned integer guaranteed to be 8 bits on all platforms.
-Values of this type can range from 0 to 255.
-</para>
-
-
<!-- ##### MACRO lseek ##### -->
<para>
View
137 docs/reference/glib/tmpl/limits.sgml
@@ -18,6 +18,69 @@ the standard integer and floating point types.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### MACRO G_MININT ##### -->
+<para>
+The minimum value which can be held in a #gint.
+</para>
+
+
+
+<!-- ##### MACRO G_MAXINT ##### -->
+<para>
+The maximum value which can be held in a #gint.
+</para>
+
+
+
+<!-- ##### MACRO G_MAXUINT ##### -->
+<para>
+The maximum value which can be held in a #guint.
+</para>
+
+
+
+<!-- ##### MACRO G_MINSHORT ##### -->
+<para>
+The minimum value which can be held in a #gshort.
+</para>
+
+
+
+<!-- ##### MACRO G_MAXSHORT ##### -->
+<para>
+The maximum value which can be held in a #gshort.
+</para>
+
+
+
+<!-- ##### MACRO G_MAXUSHORT ##### -->
+<para>
+The maximum value which can be held in a #gushort.
+</para>
+
+
+
+<!-- ##### MACRO G_MINLONG ##### -->
+<para>
+The minimum value which can be held in a #glong.
+</para>
+
+
+
+<!-- ##### MACRO G_MAXLONG ##### -->
+<para>
+The maximum value which can be held in a #glong.
+</para>
+
+
+
+<!-- ##### MACRO G_MAXULONG ##### -->
+<para>
+The maximum value which can be held in a #gulong.
+</para>
+
+
+
<!-- ##### MACRO G_MININT8 ##### -->
<para>
The minimum value which can be held in a #gint8.
@@ -111,3 +174,77 @@ The maximum value which can be held in a #guint64.
+<!-- ##### MACRO G_MAXSIZE ##### -->
+<para>
+The maximum value which can be held in a #gsize.
+</para>
+
+@Since: 2.4
+
+
+<!-- ##### MACRO G_MINSSIZE ##### -->
+<para>
+The minimum value which can be held in a #gssize.
+</para>
+
+@Since: 2.14
+
+
+<!-- ##### MACRO G_MAXSSIZE ##### -->
+<para>
+The maximum value which can be held in a #gssize.
+</para>
+
+@Since: 2.14
+
+
+<!-- ##### MACRO G_MINOFFSET ##### -->
+<para>
+The minimum value which can be held in a #goffset.
+</para>
+
+
+
+<!-- ##### MACRO G_MAXOFFSET ##### -->
+<para>
+The maximum value which can be held in a #goffset.
+</para>
+
+
+
+<!-- ##### MACRO G_MINFLOAT ##### -->
+<para>
+The minimum positive value which can be held in a #gfloat.
+</para>
+<para>
+If you are interested in the smallest value which can be held in a #gfloat,
+use -G_MAX_FLOAT.
+</para>
+
+
+
+<!-- ##### MACRO G_MAXFLOAT ##### -->
+<para>
+The maximum value which can be held in a #gfloat.
+</para>
+
+
+
+<!-- ##### MACRO G_MINDOUBLE ##### -->
+<para>
+The minimum positive value which can be held in a #gdouble.
+</para>
+<para>
+If you are interested in the smallest value which can be held in a #gdouble,
+use -G_MAXDOUBLE.
+</para>
+
+
+
+<!-- ##### MACRO G_MAXDOUBLE ##### -->
+<para>
+The maximum value which can be held in a #gdouble.
+</para>
+
+
+
View
197 docs/reference/glib/tmpl/macros_misc.sgml
@@ -320,6 +320,46 @@ See the GNU C documentation for details.
+<!-- ##### MACRO G_HAVE_GNUC_VISIBILITY ##### -->
+<para>
+This macro is defined as 1 if the compiler supports ELF visibility
+attributes (currently only <command>gcc</command>).
+</para>
+
+Since: 2.6
+
+
+
+<!-- ##### MACRO G_GNUC_INTERNAL ##### -->
+<para>
+This attribute can be used for marking library functions as being used
+internally to the library only, which may allow the compiler to handle
+function calls more efficiently.
+Note that static functions do not need to be marked as internal in this way.
+See the GNU C documentation for details.
+</para>
+<para>
+When using a compiler that supports the GNU C hidden visibility attribute,
+this macro expands to <literal>__attribute__((visibility("hidden")))</literal>.
+When using the Sun Studio compiler, it expands to <literal>__hidden</literal>.
+</para>
+<para>
+Note that for portability, the attribute should be placed before the
+function declaration. While GCC allows the macro after the declaration,
+Sun Studio does not.
+</para>
+<informalexample><programlisting>
+G_GNUC_INTERNAL
+void _g_log_fallback_handler (const gchar *log_domain,
+ GLogLevelFlags log_level,
+ const gchar *message,
+ gpointer unused_data);
+</programlisting></informalexample>
+
+Since: 2.6
+
+
+
<!-- ##### MACRO G_GNUC_MAY_ALIAS ##### -->
<para>
Expands to the GNU C <literal>may_alias</literal> type attribute
@@ -379,3 +419,160 @@ Expands to a string identifying the current function.
@Since: 2.4
+<!-- ##### MACRO G_GINT16_MODIFIER ##### -->
+<para>
+The platform dependent length modifier for constructing printf() conversion
+specifiers for values of type #gint16 or #guint16. It is a string literal,
+but doesn't include the percent-sign, such that you can add precision and
+length modifiers between percent-sign and conversion specifier and append a
+conversion specifier.
+</para>
+
+<para>
+The following example prints "0x7b";
+<informalexample>
+<programlisting>
+gint16 value = 123;
+g_print ("%#" G_GINT16_MODIFIER "x", value);
+</programlisting>
+</informalexample>
+</para>
+
+@Since: 2.4
+
+
+<!-- ##### MACRO G_GINT16_FORMAT ##### -->
+<para>
+This is the platform dependent conversion specifier for scanning and
+printing values of type #gint16. It is a string literal, but doesn't
+include the percent-sign, such that you can add precision and length
+modifiers between percent-sign and conversion specifier.
+</para>
+
+<para>
+<informalexample>
+<programlisting>
+gint16 in;
+gint32 out;
+sscanf ("42", "%" G_GINT16_FORMAT, &amp;in)
+out = in * 1000;
+g_print ("%" G_GINT32_FORMAT, out);
+</programlisting>
+</informalexample>
+</para>
+
+
+
+<!-- ##### MACRO G_GUINT16_FORMAT ##### -->
+<para>
+This is the platform dependent conversion specifier for scanning and
+printing values of type #guint16. See also #G_GINT16_FORMAT.
+</para>
+
+
+
+<!-- ##### MACRO G_GINT32_MODIFIER ##### -->
+<para>
+The platform dependent length modifier for constructing printf() conversion
+specifiers for values of type #gint32 or #guint32. See also #G_GINT16_MODIFIER.
+</para>
+
+@Since: 2.4
+
+
+<!-- ##### MACRO G_GINT32_FORMAT ##### -->
+<para>
+This is the platform dependent conversion specifier for scanning and
+printing values of type #gint32. See also #G_GINT16_FORMAT.
+</para>
+
+
+
+<!-- ##### MACRO G_GUINT32_FORMAT ##### -->
+<para>
+This is the platform dependent conversion specifier for scanning and
+printing values of type #guint32. See also #G_GINT16_FORMAT.
+</para>
+
+
+
+<!-- ##### MACRO G_GINT64_MODIFIER ##### -->
+<para>
+The platform dependent length modifier for constructing printf() conversion
+specifiers for values of type #gint64 or #guint64. See also #G_GINT16_MODIFIER.
+</para>
+
+<note>
+<para>
+Some platforms do not support printing 64 bit integers,
+even though the types are supported. On such platforms #G_GINT64_MODIFIER
+is not defined.
+</para>
+</note>
+
+@Since: 2.4
+
+
+<!-- ##### MACRO G_GINT64_FORMAT ##### -->
+<para>
+This is the platform dependent conversion specifier for scanning and
+printing values of type #gint64. See also #G_GINT16_FORMAT.
+</para>
+
+<note>
+<para>
+Some platforms do not support scanning and printing 64 bit integers,
+even though the types are supported. On such platforms #G_GINT64_FORMAT
+is not defined. Note that scanf() may not support 64 bit integers, even
+if #G_GINT64_FORMAT is defined. Due to its weak error handling, scanf() is not
+recommended for parsing anyway; consider using g_strtoull() instead.
+</para>
+</note>
+
+
+
+<!-- ##### MACRO G_GUINT64_FORMAT ##### -->
+<para>
+This is the platform dependent conversion specifier for scanning and
+printing values of type #guint64. See also #G_GINT16_FORMAT.
+</para>
+
+<note>
+<para>
+Some platforms do not support scanning and printing 64 bit integers,
+even though the types are supported. On such platforms #G_GUINT64_FORMAT
+is not defined. Note that scanf() may not support 64 bit integers, even
+if #G_GINT64_FORMAT is defined. Due to its weak error handling, scanf() is not
+recommended for parsing anyway; consider using g_strtoull() instead.
+</para>
+</note>
+
+
+
+<!-- ##### MACRO G_GSIZE_MODIFIER ##### -->
+<para>
+The platform dependent length modifier for constructing printf() conversion
+specifiers for values of type #gsize or #gssize. See also #G_GINT16_MODIFIER.
+</para>
+
+@Since: 2.6
+
+
+<!-- ##### MACRO G_GSIZE_FORMAT ##### -->
+<para>
+This is the platform dependent conversion specifier for scanning and
+printing values of type #gsize. See also #G_GINT16_FORMAT.
+</para>
+
+@Since: 2.6
+
+
+<!-- ##### MACRO G_GSSIZE_FORMAT ##### -->
+<para>
+This is the platform dependent conversion specifier for scanning and
+printing values of type #gssize. See also #G_GINT16_FORMAT.
+</para>
+
+@Since: 2.6
+
+
View
9 docs/reference/glib/tmpl/main.sgml
@@ -645,6 +645,15 @@ for the default main context.
@Returns:
+<!-- ##### TYPEDEF GPid ##### -->
+<para>
+A type which is used to hold a process identification.
+On Unix, processes are identified by a process id (an
+integer), while Windows uses process handles (which are
+pointers).
+</para>
+
+
<!-- ##### USER_FUNCTION GChildWatchFunc ##### -->
<para>
The type of functions to be called when a child exists.
View
10 docs/reference/glib/tmpl/memory.sgml
@@ -258,6 +258,16 @@ Wraps g_alloca() in a more typesafe manner.
@Returns: Pointer to stack space for @n_structs chunks of type @struct_type
+<!-- ##### MACRO g_memmove ##### -->
+<para>
+
+</para>
+
+@dest:
+@src:
+@len:
+
+
<!-- ##### FUNCTION g_memdup ##### -->
<para>
Allocates @byte_size bytes of memory, and copies @byte_size bytes into it
View
183 docs/reference/glib/tmpl/modules.sgml
@@ -99,3 +99,186 @@ just_say_hello (const char *filename, GError **error)
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### STRUCT GModule ##### -->
+<para>
+The #GModule struct is an opaque data structure to represent a
+<link linkend="glib-Dynamic-Loading-of-Modules">Dynamically-Loaded Module</link>.
+It should only be accessed via the following functions.
+</para>
+
+
+<!-- ##### FUNCTION g_module_supported ##### -->
+<para>
+Checks if modules are supported on the current platform.
+</para>
+
+@Returns: %TRUE if modules are supported.
+
+
+<!-- ##### FUNCTION g_module_build_path ##### -->
+<para>
+A portable way to build the filename of a module. The platform-specific
+prefix and suffix are added to the filename, if needed, and the result is
+added to the directory, using the correct separator character.
+</para>
+<para>
+The directory should specify the directory where the module can be found.
+It can be %NULL or an empty string to indicate that the module is in a standard
+platform-specific directory, though this is not recommended since the
+wrong module may be found.
+</para>
+<para>
+For example, calling g_module_build_path() on a Linux system with a @directory
+of <filename>/lib</filename> and a @module_name of "mylibrary" will return
+<filename>/lib/libmylibrary.so</filename>. On a Windows system, using
+<filename>\Windows</filename> as the directory it will return
+<filename>\Windows\mylibrary.dll</filename>.
+</para>
+
+@directory: the directory where the module is. This can be %NULL or the empty
+string to indicate that the standard platform-specific directories will be
+used, though that is not recommended.
+@module_name: the name of the module.
+@Returns: the complete path of the module, including the standard library
+prefix and suffix. This should be freed when no longer needed.
+
+
+<!-- ##### FUNCTION g_module_open ##### -->
+<para>
+Opens a module. If the module has already been opened, its reference
+count is incremented.
+</para>
+
+<para>
+First of all g_module_open() tries to open @file_name as a module. If
+that fails and @file_name has the ".la"-suffix (and is a libtool archive)
+it tries to open the corresponding module. If that fails and it doesn't
+have the proper module suffix for the platform (#G_MODULE_SUFFIX), this
+suffix will be appended and the corresponding module will be opended. If
+that fails and @file_name doesn't have the ".la"-suffix, this suffix is
+appended and g_module_open() tries to open the corresponding module. If
+eventually that fails as well, %NULL is returned.
+</para>
+
+@file_name: the name of the file containing the module, or %NULL to obtain
+ a #GModule representing the main program itself.
+@flags: the flags used for opening the module. This can be the logical
+OR of any of the #GModuleFlags.
+@Returns: a #GModule on success, or %NULL on failure.
+
+
+<!-- ##### ENUM GModuleFlags ##### -->
+<para>
+Flags passed to g_module_open(). Note that these flags are
+not supported on all platforms.
+</para>
+
+@G_MODULE_BIND_LAZY: specifies that symbols are only resolved when needed.
+ The default action is to bind all symbols when the module is loaded.
+@G_MODULE_BIND_LOCAL: specifies that symbols in the module should
+ not be added to the global name space. The default action on most
+ platforms is to place symbols in the module in the global name space,
+ which may cause conflicts with existing symbols.
+@G_MODULE_BIND_MASK: mask for all flags.
+
+<!-- ##### FUNCTION g_module_symbol ##### -->
+<para>
+Gets a symbol pointer from a module, such as one exported by #G_MODULE_EXPORT.
+</para>
+<para>
+Note that a valid symbol can be %NULL.
+</para>
+
+@module: a #GModule.
+@symbol_name: the name of the symbol to find.
+@symbol: returns the pointer to the symbol value.
+@Returns: %TRUE on success.
+
+
+<!-- ##### FUNCTION g_module_name ##### -->
+<para>
+Gets the filename from a #GModule.
+</para>
+
+@module: a #GModule.
+@Returns: the filename of the module, or "main" if the module is the main
+program itself.
+
+
+<!-- ##### FUNCTION g_module_make_resident ##### -->
+<para>
+Ensures that a module will never be unloaded.
+Any future g_module_close() calls on the module will be ignored.
+</para>
+
+@module: a #GModule to make permanently resident.
+
+
+<!-- ##### FUNCTION g_module_close ##### -->
+<para>
+Closes a module.
+</para>
+
+@module: a #GModule to close.
+@Returns: %TRUE on success.
+
+
+<!-- ##### FUNCTION g_module_error ##### -->
+<para>
+Gets a string describing the last module error.
+</para>
+
+@Returns: a string describing the last module error.
+
+
+<!-- ##### USER_FUNCTION GModuleCheckInit ##### -->
+<para>
+Specifies the type of the module initialization function.
+<indexterm zone="g-module-check-init"><primary>g_module_check_init</primary></indexterm>
+If a module contains a function named g_module_check_init() it is called
+automatically when the module is loaded. It is passed the #GModule structure
+and should return %NULL on success or a string describing the initialization
+error.
+</para>
+
+@module: the #GModule corresponding to the module which has just been loaded.
+@Returns: %NULL on success, or a string describing the initialization error.
+
+
+<!-- ##### USER_FUNCTION GModuleUnload ##### -->
+<para>
+<indexterm zone="g-module-unload"><primary>g_module_unload</primary></indexterm>
+Specifies the type of the module function called when it is unloaded.
+If a module contains a function named g_module_unload() it is called
+automatically when the module is unloaded.
+It is passed the #GModule structure.
+</para>
+
+@module: the #GModule about to be unloaded.
+
+
+<!-- ##### MACRO G_MODULE_SUFFIX ##### -->
+<para>
+Expands to the proper shared library suffix for the current platform
+without the leading dot. For the most Unices and Linux this is "so",
+for some HP-UX versions this is "sl" and for Windows this is "dll".
+</para>
+
+
+
+<!-- ##### MACRO G_MODULE_EXPORT ##### -->
+<para>
+Used to declare functions exported by modules. This is a no-op on Linux and
+Unices, but when compiling for Windows, it marks a symbol to be exported from
+the library or executable being built.
+</para>
+
+
+
+<!-- ##### MACRO G_MODULE_IMPORT ##### -->
+<para>
+Used to declare functions imported from modules.
+</para>
+
+
+
View
13 docs/reference/glib/tmpl/threads.sgml
@@ -89,6 +89,19 @@ common problems. To use error-checking mutexes, define the symbol
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### MACRO G_THREADS_ENABLED ##### -->
+
+<para>
+This macro is defined if GLib was compiled with thread support. This
+does not necessarily mean that there is a thread implementation
+available, but it does mean that the infrastructure is in place and
+that once you provide a thread implementation to g_thread_init(), GLib
+will be multi-thread safe. If #G_THREADS_ENABLED is not defined, then
+Glib is not, and cannot be, multi-thread safe.
+</para>
+
+
+
<!-- ##### MACRO G_THREADS_IMPL_POSIX ##### -->
<para>
View
46 docs/reference/glib/tmpl/type_conversion.sgml
@@ -57,6 +57,52 @@ integer; values outside the range of a 32-bit integer will be mangled.
<!-- ##### SECTION Stability_Level ##### -->
+<!-- ##### MACRO GINT_TO_POINTER ##### -->
+<para>
+Stuffs an integer into a pointer type.
+</para>
+<para>
+Remember, YOU MAY NOT STORE POINTERS IN INTEGERS. THIS IS NOT PORTABLE
+IN ANY WAY SHAPE OR FORM. These macros <emphasis>ONLY</emphasis> allow
+storing integers in pointers, and only preserve 32 bits of the
+integer; values outside the range of a 32-bit integer will be mangled.
+</para>
+
+@i: integer to stuff into a pointer.
+
+
+<!-- ##### MACRO GPOINTER_TO_INT ##### -->
+<para>
+Extracts an integer from a pointer. The integer must have
+been stored in the pointer with GINT_TO_POINTER().
+</para>
+<para>
+Remember, YOU MAY NOT STORE POINTERS IN INTEGERS. THIS IS NOT PORTABLE
+IN ANY WAY SHAPE OR FORM. These macros <emphasis>ONLY</emphasis> allow
+storing integers in pointers, and only preserve 32 bits of the
+integer; values outside the range of a 32-bit integer will be mangled.
+</para>
+
+@p: pointer containing an integer.
+
+
+<!-- ##### MACRO GUINT_TO_POINTER ##### -->
+<para>
+Stuffs an unsigned integer into a pointer type.
+</para>
+
+@u: unsigned integer to stuff into the pointer.
+
+
+<!-- ##### MACRO GPOINTER_TO_UINT ##### -->
+<para>
+Extracts an unsigned integer from a pointer. The integer must have
+been stored in the pointer with GUINT_TO_POINTER().
+</para>
+
+@p: pointer to extract an unsigned integer from.
+
+
<!-- ##### MACRO GSIZE_TO_POINTER ##### -->
<para>
Stuffs a #gsize into a pointer type.
View
102 docs/reference/glib/tmpl/types.sgml
@@ -119,6 +119,66 @@ Values of this type can range from 0 to #G_MAXULONG.
</para>
+<!-- ##### TYPEDEF gint8 ##### -->
+<para>
+A signed integer guaranteed to be 8 bits on all platforms.
+Values of this type can range from -128 to 127.
+</para>
+
+
+<!-- ##### TYPEDEF guint8 ##### -->
+<para>
+An unsigned integer guaranteed to be 8 bits on all platforms.
+Values of this type can range from 0 to 255.
+</para>
+
+
+<!-- ##### TYPEDEF gint16 ##### -->
+<para>
+A signed integer guaranteed to be 16 bits on all platforms.
+Values of this type can range from -32,768 to 32,767.
+</para>
+
+
+<!-- ##### TYPEDEF guint16 ##### -->
+<para>
+An unsigned integer guaranteed to be 16 bits on all platforms.
+Values of this type can range from 0 to 65,535.
+</para>
+
+
+<!-- ##### TYPEDEF gint32 ##### -->
+<para>
+A signed integer guaranteed to be 32 bits on all platforms.
+Values of this type can range from -2,147,483,648 to 2,147,483,647.
+</para>
+
+
+<!-- ##### TYPEDEF guint32 ##### -->
+<para>
+An unsigned integer guaranteed to be 32 bits on all platforms.
+Values of this type can range from 0 to 4,294,967,295.
+</para>
+
+
+<!-- ##### MACRO G_HAVE_GINT64 ##### -->
+<para>
+This macro is defined if 64-bit signed and unsigned integers are available
+on the platform.
+</para>
+
+@Deprecated: GLib requires 64-bit integer support since version 2.0, therefore
+%G_HAVE_GINT64 is <emphasis>always</emphasis> defined.
+
+
+<!-- ##### TYPEDEF gint64 ##### -->
+<para>
+A signed integer guaranteed to be 64 bits on all platforms.
+Values of this type can range from -9,223,372,036,854,775,808 to
+9,223,372,036,854,775,807.
+</para>
+
+
<!-- ##### FUNCTION guint64 ##### -->
<para>
An unsigned integer guaranteed to be 64 bits on all platforms.
@@ -128,6 +188,24 @@ Values of this type can range from 0 to 18,446,744,073,709,551,615.
@Returns:
+<!-- ##### MACRO G_GINT64_CONSTANT ##### -->
+<para>
+This macro is used to insert 64-bit integer literals into the source code.
+</para>
+
+@val: a literal integer value, e.g. 0x1d636b02300a7aa7U.
+
+
+<!-- ##### MACRO G_GUINT64_CONSTANT ##### -->
+<para>
+This macro is used to insert 64-bit unsigned integer literals into the
+source code.
+</para>
+
+@val: a literal integer value, e.g. 0x1d636b02300a7aa7U.
+@Since: 2.10
+
+
<!-- ##### TYPEDEF gfloat ##### -->
<para>
Corresponds to the standard C <type>float</type> type.
@@ -142,3 +220,27 @@ Values of this type can range from -#G_MAXDOUBLE to #G_MAXDOUBLE.
</para>
+<!-- ##### TYPEDEF gsize ##### -->
+<para>
+An unsigned integer type of the result of the sizeof operator, corresponding
+to the size_t type defined in C99. This type is wide enough to hold the numeric
+value of a pointer, so it is usually 32bit wide on a 32bit platform and
+64bit wide on a 64bit platform.
+</para>
+
+
+<!-- ##### TYPEDEF gssize ##### -->
+<para>
+A signed variant of gsize, corresponding to the ssize_t defined on most platforms.
+</para>
+
+
+<!-- ##### TYPEDEF goffset ##### -->
+<para>
+A signed integer type that is used for file offsets, corresponding to the
+C99 type off64_t.
+</para>
+
+Since: 2.14
+
+
View
30 docs/reference/glib/tmpl/version.sgml
@@ -87,6 +87,36 @@ about it. ;-)
@Returns:
+<!-- ##### MACRO GLIB_MAJOR_VERSION ##### -->
+<para>
+The major version number of the GLib library.
+Like #glib_major_version, but from the headers used at
+application compile time, rather than from the library linked against
+at application run time.
+</para>
+
+
+
+<!-- ##### MACRO GLIB_MINOR_VERSION ##### -->
+<para>
+The minor version number of the GLib library.
+Like #gtk_minor_version, but from the headers used at
+application compile time, rather than from the library linked against
+at application run time.
+</para>
+
+
+
+<!-- ##### MACRO GLIB_MICRO_VERSION ##### -->
+<para>
+The micro version number of the GLib library.
+Like #gtk_micro_version, but from the headers used at
+application compile time, rather than from the library linked against
+at application run time.
+</para>
+
+
+
<!-- ##### MACRO GLIB_CHECK_VERSION ##### -->
<para>
Checks the version of the GLib library.
View
4 gio/ChangeLog
@@ -1,3 +1,7 @@
+2008-10-16 Matthias Clasen <mclasen@redhat.com>
+
+ * === Released 2.18.2 ===
+
2008-10-14 Matthias Clasen <mclasen@redhat.com>
Merged from trunk:
View
4 gmodule/ChangeLog
@@ -1,3 +1,7 @@
+2008-10-16 Matthias Clasen <mclasen@redhat.com>
+
+ * === Released 2.18.2 ===
+
2008-09-17 Matthias Clasen <mclasen@redhat.com>
* === Released 2.18.1 ===
View
4 gobject/ChangeLog
@@ -1,3 +1,7 @@
+2008-10-16 Matthias Clasen <mclasen@redhat.com>
+
+ * === Released 2.18.2 ===
+
2008-09-17 Matthias Clasen <mclasen@redhat.com>
* === Released 2.18.1 ===
View
4 gthread/ChangeLog
@@ -1,3 +1,7 @@
+2008-10-16 Matthias Clasen <mclasen@redhat.com>
+
+ * === Released 2.18.2 ===
+
2008-09-17 Matthias Clasen <mclasen@redhat.com>
* === Released 2.18.1 ===
View
4 po/ChangeLog
@@ -1,3 +1,7 @@
+2008-10-16 Matthias Clasen <mclasen@redhat.com>
+
+ * === Released 2.18.2 ===
+
2008-10-06 Kjartan Maraas <kmaraas@gnome.org>
* nb.po: Try to complete this.
View
91 po/am.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: glib VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-17 19:21-0400\n"
+"POT-Creation-Date: 2008-10-16 17:07-0400\n"
"PO-Revision-Date: 2003-01-16 08:39+EDT\n"
"Last-Translator: Ge'ez Frontier Foundation <locales@geez.org>\n"
"Language-Team: Amharic <locales@geez.org>\n"
@@ -367,124 +367,124 @@ msgstr "የማይሰራ የUTF-8 ጽሑፍ"
msgid "Invalid UTF-8 encoded text - not a start char"
msgstr "የማይሰራ የUTF-8 ጽሑፍ"
-#: glib/gmarkup.c:1117
+#: glib/gmarkup.c:1120
#, fuzzy, c-format
msgid "Invalid UTF-8 encoded text - not valid '%s'"
msgstr "የማይሰራ የUTF-8 ጽሑፍ"
-#: glib/gmarkup.c:1155
+#: glib/gmarkup.c:1158
msgid "Document must begin with an element (e.g. <book>)"
msgstr ""
-#: glib/gmarkup.c:1195
+#: glib/gmarkup.c:1198
#, c-format
msgid ""
"'%s' is not a valid character following a '<' character; it may not begin an "
"element name"
msgstr ""
-#: glib/gmarkup.c:1263
+#: glib/gmarkup.c:1266
#, c-format
msgid ""
"Odd character '%s', expected a '>' character to end the empty-element tag '%"
"s'"
msgstr ""
-#: glib/gmarkup.c:1352
+#: glib/gmarkup.c:1355
#, c-format
msgid ""
"Odd character '%s', expected a '=' after attribute name '%s' of element '%s'"
msgstr ""
-#: glib/gmarkup.c:1394
+#: glib/gmarkup.c:1397
#, c-format
msgid ""
"Odd character '%s', expected a '>' or '/' character to end the start tag of "
"element '%s', or optionally an attribute; perhaps you used an invalid "
"character in an attribute name"
msgstr ""
-#: glib/gmarkup.c:1480
+#: glib/gmarkup.c:1483
#, c-format
msgid ""
"Odd character '%s', expected an open quote mark after the equals sign when "
"giving value for attribute '%s' of element '%s'"
msgstr ""
-#: glib/gmarkup.c:1622
+#: glib/gmarkup.c:1625
#, c-format
msgid ""
"'%s' is not a valid character following the characters '</'; '%s' may not "
"begin an element name"
msgstr ""
-#: glib/gmarkup.c:1662
+#: glib/gmarkup.c:1665
#, c-format
msgid ""
"'%s' is not a valid character following the close element name '%s'; the "
"allowed character is '>'"
msgstr ""
-#: glib/gmarkup.c:1673
+#: glib/gmarkup.c:1676
#, c-format
msgid "Element '%s' was closed, no element is currently open"
msgstr ""
-#: glib/gmarkup.c:1682
+#: glib/gmarkup.c:1685
#, c-format
msgid "Element '%s' was closed, but the currently open element is '%s'"
msgstr ""
-#: glib/gmarkup.c:1845
+#: glib/gmarkup.c:1848
msgid "Document was empty or contained only whitespace"
msgstr ""
-#: glib/gmarkup.c:1859
+#: glib/gmarkup.c:1862
msgid "Document ended unexpectedly just after an open angle bracket '<'"
msgstr ""
-#: glib/gmarkup.c:1867 glib/gmarkup.c:1912
+#: glib/gmarkup.c:1870 glib/gmarkup.c:1915
#, c-format
msgid ""
"Document ended unexpectedly with elements still open - '%s' was the last "
"element opened"
msgstr ""
-#: glib/gmarkup.c:1875
+#: glib/gmarkup.c:1878
#, c-format
msgid ""
"Document ended unexpectedly, expected to see a close angle bracket ending "
"the tag <%s/>"
msgstr ""
-#: glib/gmarkup.c:1881
+#: glib/gmarkup.c:1884
msgid "Document ended unexpectedly inside an element name"
msgstr ""
-#: glib/gmarkup.c:1887
+#: glib/gmarkup.c:1890
msgid "Document ended unexpectedly inside an attribute name"
msgstr ""
-#: glib/gmarkup.c:1892
+#: glib/gmarkup.c:1895
msgid "Document ended unexpectedly inside an element-opening tag."
msgstr ""
-#: glib/gmarkup.c:1898
+#: glib/gmarkup.c:1901
msgid ""
"Document ended unexpectedly after the equals sign following an attribute "
"name; no attribute value"
msgstr ""
-#: glib/gmarkup.c:1905
+#: glib/gmarkup.c:1908
msgid "Document ended unexpectedly while inside an attribute value"
msgstr ""
-#: glib/gmarkup.c:1921
+#: glib/gmarkup.c:1924
#, c-format
msgid "Document ended unexpectedly inside the close tag for element '%s'"
msgstr ""
-#: glib/gmarkup.c:1927
+#: glib/gmarkup.c:1930
msgid "Document ended unexpectedly inside a comment or processing instruction"
msgstr ""
@@ -1114,34 +1114,34 @@ msgstr ""
msgid "Unexpected early end-of-stream"
msgstr ""
-#: gio/gdesktopappinfo.c:435 gio/gwin32appinfo.c:222
+#: gio/gdesktopappinfo.c:436 gio/gwin32appinfo.c:222
msgid "Unnamed"
msgstr ""
-#: gio/gdesktopappinfo.c:612
+#: gio/gdesktopappinfo.c:621
msgid "Desktop file didn't specify Exec field"
msgstr ""
-#: gio/gdesktopappinfo.c:906
+#: gio/gdesktopappinfo.c:915
msgid "Unable to find terminal required for application"
msgstr ""
-#: gio/gdesktopappinfo.c:1138
+#: gio/gdesktopappinfo.c:1147
#, c-format
msgid "Can't create user application configuration folder %s: %s"
msgstr ""
-#: gio/gdesktopappinfo.c:1142
+#: gio/gdesktopappinfo.c:1151
#, c-format
msgid "Can't create user MIME configuration folder %s: %s"
msgstr ""
-#: gio/gdesktopappinfo.c:1481
+#: gio/gdesktopappinfo.c:1520
#, c-format
msgid "Can't create user desktop file %s"
msgstr ""
-#: gio/gdesktopappinfo.c:1556
+#: gio/gdesktopappinfo.c:1595
#, c-format
msgid "Custom definition for %s"
msgstr ""
@@ -1400,64 +1400,61 @@ msgstr "ፋይል '%s'ን ለማንበብ ስህተት አለ፦ %s"
msgid " (invalid encoding)"
msgstr ""
-#: gio/glocalfileinfo.c:1696
+#: gio/glocalfileinfo.c:1698
#, fuzzy, c-format
msgid "Error stating file descriptor: %s"
msgstr "ፋይል '%s'ን ለማንበብ ስህተት አለ፦ %s"
-#: gio/glocalfileinfo.c:1741
+#: gio/glocalfileinfo.c:1743
msgid "Invalid attribute type (uint32 expected)"
msgstr ""
-#: gio/glocalfileinfo.c:1759
+#: gio/glocalfileinfo.c:1761
msgid "Invalid attribute type (uint64 expected)"
msgstr ""
-#: gio/glocalfileinfo.c:1778 gio/glocalfileinfo.c:1796
-#, c-format
+#: gio/glocalfileinfo.c:1780 gio/glocalfileinfo.c:1799
msgid "Invalid attribute type (byte string expected)"
msgstr ""
-#: gio/glocalfileinfo.c:1822
+#: gio/glocalfileinfo.c:1825
#, fuzzy, c-format
msgid "Error setting permissions: %s"
msgstr "ፋይል '%s'ን ለማንበብ ስህተት አለ፦ %s"
-#: gio/glocalfileinfo.c:1873 gio/glocalfileinfo.c:2041
+#: gio/glocalfileinfo.c:1876 gio/glocalfileinfo.c:2044
#, fuzzy, c-format
msgid "Error setting owner: %s"
msgstr "ፋይል '%s'ን ለማንበብ ስህተት አለ፦ %s"
-#: gio/glocalfileinfo.c:1896
+#: gio/glocalfileinfo.c:1899
msgid "symlink must be non-NULL"
msgstr ""
-#: gio/glocalfileinfo.c:1906 gio/glocalfileinfo.c:1925
-#: gio/glocalfileinfo.c:1936
+#: gio/glocalfileinfo.c:1909 gio/glocalfileinfo.c:1928
+#: gio/glocalfileinfo.c:1939
#, fuzzy, c-format
msgid "Error setting symlink: %s"
msgstr "ፋይል '%s'ን ለማንበብ ስህተት አለ፦ %s"
-#: gio/glocalfileinfo.c:1915
+#: gio/glocalfileinfo.c:1918
msgid "Error setting symlink: file is not a symlink"
msgstr ""
-#: gio/glocalfileinfo.c:2063
-#, c-format
+#: gio/glocalfileinfo.c:2067
msgid "SELinux context must be non-NULL"
msgstr ""
-#: gio/glocalfileinfo.c:2079
+#: gio/glocalfileinfo.c:2082
#, fuzzy, c-format
msgid "Error setting SELinux context: %s"
msgstr "ፋይል '%s'ን ለማንበብ ስህተት አለ፦ %s"
-#: gio/glocalfileinfo.c:2086
-#, c-format
+#: gio/glocalfileinfo.c:2089
msgid "SELinux is not enabled on this system"
msgstr ""
-#: gio/glocalfileinfo.c:2147
+#: gio/glocalfileinfo.c:2150
#, c-format
msgid "Setting attribute %s not supported"
msgstr ""
View
1,046 po/ar.po
@@ -11,1211 +11,1178 @@ msgid ""
msgstr ""
"Project-Id-Version: glib.HEAD\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-15 15:14+0000\n"
+"POT-Creation-Date: 2008-10-16 17:07-0400\n"
"PO-Revision-Date: 2008-09-17 05:06+0300\n"
"Last-Translator: Anas Afif Emad <anas.e87@gmail.com>\n"
"Language-Team: Arabic <doc@arabeyes.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
+"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-#: ../glib/gbookmarkfile.c:737
+#: glib/gbookmarkfile.c:737
#, c-format
msgid "Unexpected attribute '%s' for element '%s'"
msgstr "صفة غير متوقّعة '%s' للعنصر '%s'"
-#: ../glib/gbookmarkfile.c:748
-#: ../glib/gbookmarkfile.c:819
-#: ../glib/gbookmarkfile.c:829
-#: ../glib/gbookmarkfile.c:936
+#: glib/gbookmarkfile.c:748 glib/gbookmarkfile.c:819 glib/gbookmarkfile.c:829
+#: glib/gbookmarkfile.c:936
#, c-format
msgid "Attribute '%s' of element '%s' not found"
msgstr "الصفة '%s' للعنصر '%s' غير موجودة"
-#: ../glib/gbookmarkfile.c:1106
-#: ../glib/gbookmarkfile.c:1171
-#: ../glib/gbookmarkfile.c:1235
-#: ../glib/gbookmarkfile.c:1245
+#: glib/gbookmarkfile.c:1106 glib/gbookmarkfile.c:1171
+#: glib/gbookmarkfile.c:1235 glib/gbookmarkfile.c:1245
#, c-format
msgid "Unexpected tag '%s', tag '%s' expected"
msgstr "وسْم غير متوقع '%s'، توقّعت الوسْم '%s'"
-#: ../glib/gbookmarkfile.c:1131
-#: ../glib/gbookmarkfile.c:1145
-#: ../glib/gbookmarkfile.c:1213