RubyGems - rsvg2 - Versions diffs - 0.90.2-x86-mingw32 → 0.90.2.1-x86-mingw32 - Mend

rsvg2 0.90.2-x86-mingw32 → 0.90.2.1-x86-mingw32

Files changed (1552) hide show

data/vendor/local/share/gtk-doc/html/glib/glib-Caches.html CHANGED

@@ -8,7 +8,7 @@
 <link rel="up" href="glib-data-types.html" title="GLib Data Types">
 <link rel="prev" href="glib-Relations-and-Tuples.html" title="Relations and Tuples">
 <link rel="next" href="glib-Memory-Allocators.html" title="Memory Allocators">
-<meta name="generator" content="GTK-Doc V1.14 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.15.1 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,7 +26,7 @@
                   <a href="#glib-Caches.description" class="shortcut">Description</a>
 </td></tr>
 </table>
-<div class="refentry" title="Caches">
+<div class="refentry">
 <a name="glib-Caches"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
@@ -36,13 +36,13 @@
 </td>
 <td valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
+<div class="refsynopsisdiv">
 <a name="glib-Caches.synopsis"></a><h2>Synopsis</h2>
 <pre class="synopsis">
 #include &lt;glib.h&gt;
                     <a class="link" href="glib-Caches.html#GCache" title="GCache">GCache</a>;
-<a class="link" href="glib-Caches.html#GCache" title="GCache"><span class="returnvalue">GCache</span></a>*             <a class="link" href="glib-Caches.html#g-cache-new" title="g_cache_new ()">g_cache_new</a>                         (<em class="parameter"><code><a class="link" href="glib-Caches.html#GCacheNewFunc" title="GCacheNewFunc ()"><span class="type">GCacheNewFunc</span></a> value_new_func</code></em>,
+<a class="link" href="glib-Caches.html#GCache" title="GCache"><span class="returnvalue">GCache</span></a> *            <a class="link" href="glib-Caches.html#g-cache-new" title="g_cache_new ()">g_cache_new</a>                         (<em class="parameter"><code><a class="link" href="glib-Caches.html#GCacheNewFunc" title="GCacheNewFunc ()"><span class="type">GCacheNewFunc</span></a> value_new_func</code></em>,
                                                          <em class="parameter"><code><a class="link" href="glib-Caches.html#GCacheDestroyFunc" title="GCacheDestroyFunc ()"><span class="type">GCacheDestroyFunc</span></a> value_destroy_func</code></em>,
                                                          <em class="parameter"><code><a class="link" href="glib-Caches.html#GCacheDupFunc" title="GCacheDupFunc ()"><span class="type">GCacheDupFunc</span></a> key_dup_func</code></em>,
                                                          <em class="parameter"><code><a class="link" href="glib-Caches.html#GCacheDestroyFunc" title="GCacheDestroyFunc ()"><span class="type">GCacheDestroyFunc</span></a> key_destroy_func</code></em>,
@@ -67,15 +67,15 @@
 <a class="link" href="glib-Basic-Types.html#gpointer" title="gpointer"><span class="returnvalue">gpointer</span></a>            (<a class="link" href="glib-Caches.html#GCacheNewFunc" title="GCacheNewFunc ()">*GCacheNewFunc</a>)                    (<em class="parameter"><code><a class="link" href="glib-Basic-Types.html#gpointer" title="gpointer"><span class="type">gpointer</span></a> key</code></em>);
 </pre>
 </div>
-<div class="refsect1" title="Description">
+<div class="refsect1">
 <a name="glib-Caches.description"></a><h2>Description</h2>
 <p>
 A <a class="link" href="glib-Caches.html#GCache" title="GCache"><span class="type">GCache</span></a> allows sharing of complex data structures, in order to
 save system resources.
 </p>
 <p>
-GTK+ uses caches for <span class="type">GtkStyles</span> and <span class="type">GdkGCs</span>. These consume a lot of
-resources, so a <a class="link" href="glib-Caches.html#GCache" title="GCache"><span class="type">GCache</span></a> is used to see if a <span class="type">GtkStyle</span> or <span class="type">GdkGC</span> with
+GTK+ uses caches for <a href="http://library.gnome.org/devel/gtk/unstable/GtkStyle.html"><span class="type">GtkStyles</span></a> and <a href="http://library.gnome.org/devel/gdk/unstable/gdk3-Graphics-Contexts.html#GdkGC"><span class="type">GdkGCs</span></a>. These consume a lot of
+resources, so a <a class="link" href="glib-Caches.html#GCache" title="GCache"><span class="type">GCache</span></a> is used to see if a <a href="http://library.gnome.org/devel/gtk/unstable/GtkStyle.html"><span class="type">GtkStyle</span></a> or <a href="http://library.gnome.org/devel/gdk/unstable/gdk3-Graphics-Contexts.html#GdkGC"><span class="type">GdkGC</span></a> with
 the required properties already exists. If it does, then the
 existing object is used instead of creating a new one.
 </p>
@@ -84,9 +84,9 @@ existing object is used instead of creating a new one.
 of a particular resource. A <a class="link" href="glib-Caches.html#GCache" title="GCache"><span class="type">GCache</span></a> value is the actual resource.
 </p>
 </div>
-<div class="refsect1" title="Details">
+<div class="refsect1">
 <a name="glib-Caches.details"></a><h2>Details</h2>
-<div class="refsect2" title="GCache">
+<div class="refsect2">
 <a name="GCache"></a><h3>GCache</h3>
 <pre class="programlisting">typedef struct _GCache GCache;</pre>
 <p>
@@ -96,9 +96,9 @@ following functions.
 </p>
 </div>
 <hr>
-<div class="refsect2" title="g_cache_new ()">
+<div class="refsect2">
 <a name="g-cache-new"></a><h3>g_cache_new ()</h3>
-<pre class="programlisting"><a class="link" href="glib-Caches.html#GCache" title="GCache"><span class="returnvalue">GCache</span></a>*             g_cache_new                         (<em class="parameter"><code><a class="link" href="glib-Caches.html#GCacheNewFunc" title="GCacheNewFunc ()"><span class="type">GCacheNewFunc</span></a> value_new_func</code></em>,
+<pre class="programlisting"><a class="link" href="glib-Caches.html#GCache" title="GCache"><span class="returnvalue">GCache</span></a> *            g_cache_new                         (<em class="parameter"><code><a class="link" href="glib-Caches.html#GCacheNewFunc" title="GCacheNewFunc ()"><span class="type">GCacheNewFunc</span></a> value_new_func</code></em>,
                                                          <em class="parameter"><code><a class="link" href="glib-Caches.html#GCacheDestroyFunc" title="GCacheDestroyFunc ()"><span class="type">GCacheDestroyFunc</span></a> value_destroy_func</code></em>,
                                                          <em class="parameter"><code><a class="link" href="glib-Caches.html#GCacheDupFunc" title="GCacheDupFunc ()"><span class="type">GCacheDupFunc</span></a> key_dup_func</code></em>,
                                                          <em class="parameter"><code><a class="link" href="glib-Caches.html#GCacheDestroyFunc" title="GCacheDestroyFunc ()"><span class="type">GCacheDestroyFunc</span></a> key_destroy_func</code></em>,
@@ -165,7 +165,7 @@ Creates a new <a class="link" href="glib-Caches.html#GCache" title="GCache"><spa
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="g_cache_insert ()">
+<div class="refsect2">
 <a name="g-cache-insert"></a><h3>g_cache_insert ()</h3>
 <pre class="programlisting"><a class="link" href="glib-Basic-Types.html#gpointer" title="gpointer"><span class="returnvalue">gpointer</span></a>            g_cache_insert                      (<em class="parameter"><code><a class="link" href="glib-Caches.html#GCache" title="GCache"><span class="type">GCache</span></a> *cache</code></em>,
                                                          <em class="parameter"><code><a class="link" href="glib-Basic-Types.html#gpointer" title="gpointer"><span class="type">gpointer</span></a> key</code></em>);</pre>
@@ -201,7 +201,7 @@ are inserted into the <a class="link" href="glib-Caches.html#GCache" title="GCac
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="g_cache_remove ()">
+<div class="refsect2">
 <a name="g-cache-remove"></a><h3>g_cache_remove ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                g_cache_remove                      (<em class="parameter"><code><a class="link" href="glib-Caches.html#GCache" title="GCache"><span class="type">GCache</span></a> *cache</code></em>,
                                                          <em class="parameter"><code><a class="link" href="glib-Basic-Types.html#gconstpointer" title="gconstpointer"><span class="type">gconstpointer</span></a> value</code></em>);</pre>
@@ -227,7 +227,7 @@ then the value and its corresponding key are destroyed, using the
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="g_cache_destroy ()">
+<div class="refsect2">
 <a name="g-cache-destroy"></a><h3>g_cache_destroy ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                g_cache_destroy                     (<em class="parameter"><code><a class="link" href="glib-Caches.html#GCache" title="GCache"><span class="type">GCache</span></a> *cache</code></em>);</pre>
 <p>
@@ -247,7 +247,7 @@ contained in the <a class="link" href="glib-Caches.html#GCache" title="GCache"><
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="g_cache_key_foreach ()">
+<div class="refsect2">
 <a name="g-cache-key-foreach"></a><h3>g_cache_key_foreach ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                g_cache_key_foreach                 (<em class="parameter"><code><a class="link" href="glib-Caches.html#GCache" title="GCache"><span class="type">GCache</span></a> *cache</code></em>,
                                                          <em class="parameter"><code><a class="link" href="glib-Hash-Tables.html#GHFunc" title="GHFunc ()"><span class="type">GHFunc</span></a> func</code></em>,
@@ -283,12 +283,12 @@ pairs to its callback function !
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="g_cache_value_foreach ()">
+<div class="refsect2">
 <a name="g-cache-value-foreach"></a><h3>g_cache_value_foreach ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                g_cache_value_foreach               (<em class="parameter"><code><a class="link" href="glib-Caches.html#GCache" title="GCache"><span class="type">GCache</span></a> *cache</code></em>,
                                                          <em class="parameter"><code><a class="link" href="glib-Hash-Tables.html#GHFunc" title="GHFunc ()"><span class="type">GHFunc</span></a> func</code></em>,
                                                          <em class="parameter"><code><a class="link" href="glib-Basic-Types.html#gpointer" title="gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
-<div class="warning" title="Warning" style="margin-left: 0.5in; margin-right: 0.5in;">
+<div class="warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">g_cache_value_foreach</code> has been deprecated since version 2.10 and should not be used in newly-written code. The reason is that it passes pointers to internal
                  data structures to <em class="parameter"><code>func</code></em>; use <a class="link" href="glib-Caches.html#g-cache-key-foreach" title="g_cache_key_foreach ()"><code class="function">g_cache_key_foreach()</code></a>
@@ -319,7 +319,7 @@ Calls the given function for each of the values in the <a class="link" href="gli
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="GCacheDestroyFunc ()">
+<div class="refsect2">
 <a name="GCacheDestroyFunc"></a><h3>GCacheDestroyFunc ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                (*GCacheDestroyFunc)                (<em class="parameter"><code><a class="link" href="glib-Basic-Types.html#gpointer" title="gpointer"><span class="type">gpointer</span></a> value</code></em>);</pre>
 <p>
@@ -338,7 +338,7 @@ memory and other resources associated with it.
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="GCacheDupFunc ()">
+<div class="refsect2">
 <a name="GCacheDupFunc"></a><h3>GCacheDupFunc ()</h3>
 <pre class="programlisting"><a class="link" href="glib-Basic-Types.html#gpointer" title="gpointer"><span class="returnvalue">gpointer</span></a>            (*GCacheDupFunc)                    (<em class="parameter"><code><a class="link" href="glib-Basic-Types.html#gpointer" title="gpointer"><span class="type">gpointer</span></a> value</code></em>);</pre>
 <p>
@@ -365,7 +365,7 @@ should return a duplicate of the key.
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="GCacheNewFunc ()">
+<div class="refsect2">
 <a name="GCacheNewFunc"></a><h3>GCacheNewFunc ()</h3>
 <pre class="programlisting"><a class="link" href="glib-Basic-Types.html#gpointer" title="gpointer"><span class="returnvalue">gpointer</span></a>            (*GCacheNewFunc)                    (<em class="parameter"><code><a class="link" href="glib-Basic-Types.html#gpointer" title="gpointer"><span class="type">gpointer</span></a> key</code></em>);</pre>
 <p>
@@ -393,6 +393,6 @@ value corresponding to the key.
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.14</div>
+          Generated by GTK-Doc V1.15.1</div>
 </body>
 </html>

data/vendor/local/share/gtk-doc/html/glib/glib-Character-Set-Conversion.html CHANGED

@@ -8,7 +8,7 @@
 <link rel="up" href="glib-utilities.html" title="GLib Utilities">
 <link rel="prev" href="glib-String-Utility-Functions.html" title="String Utility Functions">
 <link rel="next" href="glib-Unicode-Manipulation.html" title="Unicode Manipulation">
-<meta name="generator" content="GTK-Doc V1.14 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.15.1 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -26,28 +26,28 @@
                   <a href="#glib-Character-Set-Conversion.description" class="shortcut">Description</a>
 </td></tr>
 </table>
-<div class="refentry" title="Character Set Conversion">
+<div class="refentry">
 <a name="glib-Character-Set-Conversion"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
 <h2><span class="refentrytitle"><a name="glib-Character-Set-Conversion.top_of_page"></a>Character Set Conversion</span></h2>
-<p>Character Set Conversion — convert strings between different character sets using <code class="function">iconv()</code></p>
+<p>Character Set Conversion — Convert strings between different character sets</p>
 </td>
 <td valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
+<div class="refsynopsisdiv">
 <a name="glib-Character-Set-Conversion.synopsis"></a><h2>Synopsis</h2>
 <pre class="synopsis">
 #include &lt;glib.h&gt;
-<a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="returnvalue">gchar</span></a>*              <a class="link" href="glib-Character-Set-Conversion.html#g-convert" title="g_convert ()">g_convert</a>                           (<em class="parameter"><code>const <a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="type">gchar</span></a> *str</code></em>,
+<a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="returnvalue">gchar</span></a> *             <a class="link" href="glib-Character-Set-Conversion.html#g-convert" title="g_convert ()">g_convert</a>                           (<em class="parameter"><code>const <a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="type">gchar</span></a> *str</code></em>,
                                                          <em class="parameter"><code><a class="link" href="glib-Basic-Types.html#gssize" title="gssize"><span class="type">gssize</span></a> len</code></em>,
                                                          <em class="parameter"><code>const <a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="type">gchar</span></a> *to_codeset</code></em>,
                                                          <em class="parameter"><code>const <a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="type">gchar</span></a> *from_codeset</code></em>,
                                                          <em class="parameter"><code><a class="link" href="glib-Basic-Types.html#gsize" title="gsize"><span class="type">gsize</span></a> *bytes_read</code></em>,
                                                          <em class="parameter"><code><a class="link" href="glib-Basic-Types.html#gsize" title="gsize"><span class="type">gsize</span></a> *bytes_written</code></em>,
                                                          <em class="parameter"><code><a class="link" href="glib-Error-Reporting.html#GError" title="GError"><span class="type">GError</span></a> **error</code></em>);
-<a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="returnvalue">gchar</span></a>*              <a class="link" href="glib-Character-Set-Conversion.html#g-convert-with-fallback" title="g_convert_with_fallback ()">g_convert_with_fallback</a>             (<em class="parameter"><code>const <a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="type">gchar</span></a> *str</code></em>,
+<a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="returnvalue">gchar</span></a> *             <a class="link" href="glib-Character-Set-Conversion.html#g-convert-with-fallback" title="g_convert_with_fallback ()">g_convert_with_fallback</a>             (<em class="parameter"><code>const <a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="type">gchar</span></a> *str</code></em>,
                                                          <em class="parameter"><code><a class="link" href="glib-Basic-Types.html#gssize" title="gssize"><span class="type">gssize</span></a> len</code></em>,
                                                          <em class="parameter"><code>const <a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="type">gchar</span></a> *to_codeset</code></em>,
                                                          <em class="parameter"><code>const <a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="type">gchar</span></a> *from_codeset</code></em>,
@@ -56,7 +56,7 @@
                                                          <em class="parameter"><code><a class="link" href="glib-Basic-Types.html#gsize" title="gsize"><span class="type">gsize</span></a> *bytes_written</code></em>,
                                                          <em class="parameter"><code><a class="link" href="glib-Error-Reporting.html#GError" title="GError"><span class="type">GError</span></a> **error</code></em>);
                     <a class="link" href="glib-Character-Set-Conversion.html#GIConv" title="GIConv">GIConv</a>;
-<a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="returnvalue">gchar</span></a>*              <a class="link" href="glib-Character-Set-Conversion.html#g-convert-with-iconv" title="g_convert_with_iconv ()">g_convert_with_iconv</a>                (<em class="parameter"><code>const <a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="type">gchar</span></a> *str</code></em>,
+<a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="returnvalue">gchar</span></a> *             <a class="link" href="glib-Character-Set-Conversion.html#g-convert-with-iconv" title="g_convert_with_iconv ()">g_convert_with_iconv</a>                (<em class="parameter"><code>const <a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="type">gchar</span></a> *str</code></em>,
                                                          <em class="parameter"><code><a class="link" href="glib-Basic-Types.html#gssize" title="gssize"><span class="type">gssize</span></a> len</code></em>,
                                                          <em class="parameter"><code><a class="link" href="glib-Character-Set-Conversion.html#GIConv" title="GIConv"><span class="type">GIConv</span></a> converter</code></em>,
                                                          <em class="parameter"><code><a class="link" href="glib-Basic-Types.html#gsize" title="gsize"><span class="type">gsize</span></a> *bytes_read</code></em>,
@@ -71,31 +71,25 @@
                                                          <em class="parameter"><code><a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="type">gchar</span></a> **outbuf</code></em>,
                                                          <em class="parameter"><code><a class="link" href="glib-Basic-Types.html#gsize" title="gsize"><span class="type">gsize</span></a> *outbytes_left</code></em>);
 <a class="link" href="glib-Basic-Types.html#gint" title="gint"><span class="returnvalue">gint</span></a>                <a class="link" href="glib-Character-Set-Conversion.html#g-iconv-close" title="g_iconv_close ()">g_iconv_close</a>                       (<em class="parameter"><code><a class="link" href="glib-Character-Set-Conversion.html#GIConv" title="GIConv"><span class="type">GIConv</span></a> converter</code></em>);
-<a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="returnvalue">gchar</span></a>*              <a class="link" href="glib-Character-Set-Conversion.html#g-locale-to-utf8" title="g_locale_to_utf8 ()">g_locale_to_utf8</a>                    (<em class="parameter"><code>const <a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="type">gchar</span></a> *opsysstring</code></em>,
+<a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="returnvalue">gchar</span></a> *             <a class="link" href="glib-Character-Set-Conversion.html#g-locale-to-utf8" title="g_locale_to_utf8 ()">g_locale_to_utf8</a>                    (<em class="parameter"><code>const <a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="type">gchar</span></a> *opsysstring</code></em>,
                                                          <em class="parameter"><code><a class="link" href="glib-Basic-Types.html#gssize" title="gssize"><span class="type">gssize</span></a> len</code></em>,
                                                          <em class="parameter"><code><a class="link" href="glib-Basic-Types.html#gsize" title="gsize"><span class="type">gsize</span></a> *bytes_read</code></em>,
                                                          <em class="parameter"><code><a class="link" href="glib-Basic-Types.html#gsize" title="gsize"><span class="type">gsize</span></a> *bytes_written</code></em>,
                                                          <em class="parameter"><code><a class="link" href="glib-Error-Reporting.html#GError" title="GError"><span class="type">GError</span></a> **error</code></em>);
-<a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="returnvalue">gchar</span></a>*              <a class="link" href="glib-Character-Set-Conversion.html#g-filename-to-utf8" title="g_filename_to_utf8 ()">g_filename_to_utf8</a>                  (<em class="parameter"><code>const <a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="type">gchar</span></a> *opsysstring</code></em>,
+<a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="returnvalue">gchar</span></a> *             <a class="link" href="glib-Character-Set-Conversion.html#g-filename-to-utf8" title="g_filename_to_utf8 ()">g_filename_to_utf8</a>                  (<em class="parameter"><code>const <a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="type">gchar</span></a> *opsysstring</code></em>,
                                                          <em class="parameter"><code><a class="link" href="glib-Basic-Types.html#gssize" title="gssize"><span class="type">gssize</span></a> len</code></em>,
                                                          <em class="parameter"><code><a class="link" href="glib-Basic-Types.html#gsize" title="gsize"><span class="type">gsize</span></a> *bytes_read</code></em>,
                                                          <em class="parameter"><code><a class="link" href="glib-Basic-Types.html#gsize" title="gsize"><span class="type">gsize</span></a> *bytes_written</code></em>,
                                                          <em class="parameter"><code><a class="link" href="glib-Error-Reporting.html#GError" title="GError"><span class="type">GError</span></a> **error</code></em>);
-<a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="returnvalue">gchar</span></a>*              <a class="link" href="glib-Character-Set-Conversion.html#g-filename-from-utf8" title="g_filename_from_utf8 ()">g_filename_from_utf8</a>                (<em class="parameter"><code>const <a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="type">gchar</span></a> *utf8string</code></em>,
+<a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="returnvalue">gchar</span></a> *             <a class="link" href="glib-Character-Set-Conversion.html#g-filename-from-utf8" title="g_filename_from_utf8 ()">g_filename_from_utf8</a>                (<em class="parameter"><code>const <a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="type">gchar</span></a> *utf8string</code></em>,
                                                          <em class="parameter"><code><a class="link" href="glib-Basic-Types.html#gssize" title="gssize"><span class="type">gssize</span></a> len</code></em>,
                                                          <em class="parameter"><code><a class="link" href="glib-Basic-Types.html#gsize" title="gsize"><span class="type">gsize</span></a> *bytes_read</code></em>,
                                                          <em class="parameter"><code><a class="link" href="glib-Basic-Types.html#gsize" title="gsize"><span class="type">gsize</span></a> *bytes_written</code></em>,
                                                          <em class="parameter"><code><a class="link" href="glib-Error-Reporting.html#GError" title="GError"><span class="type">GError</span></a> **error</code></em>);
-<a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="returnvalue">gchar</span></a> *             <a class="link" href="glib-Character-Set-Conversion.html#g-filename-from-uri" title="g_filename_from_uri ()">g_filename_from_uri</a>                 (<em class="parameter"><code>const <a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="type">gchar</span></a> *uri</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="type">gchar</span></a> **hostname</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="glib-Error-Reporting.html#GError" title="GError"><span class="type">GError</span></a> **error</code></em>);
-<a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="returnvalue">gchar</span></a> *             <a class="link" href="glib-Character-Set-Conversion.html#g-filename-to-uri" title="g_filename_to_uri ()">g_filename_to_uri</a>                   (<em class="parameter"><code>const <a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="type">gchar</span></a> *filename</code></em>,
-                                                         <em class="parameter"><code>const <a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="type">gchar</span></a> *hostname</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="glib-Error-Reporting.html#GError" title="GError"><span class="type">GError</span></a> **error</code></em>);
 <a class="link" href="glib-Basic-Types.html#gboolean" title="gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="glib-Character-Set-Conversion.html#g-get-filename-charsets" title="g_get_filename_charsets ()">g_get_filename_charsets</a>             (<em class="parameter"><code>G_CONST_RETURN <a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="type">gchar</span></a> ***charsets</code></em>);
 <a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="returnvalue">gchar</span></a> *             <a class="link" href="glib-Character-Set-Conversion.html#g-filename-display-name" title="g_filename_display_name ()">g_filename_display_name</a>             (<em class="parameter"><code>const <a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="type">gchar</span></a> *filename</code></em>);
 <a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="returnvalue">gchar</span></a> *             <a class="link" href="glib-Character-Set-Conversion.html#g-filename-display-basename" title="g_filename_display_basename ()">g_filename_display_basename</a>         (<em class="parameter"><code>const <a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="type">gchar</span></a> *filename</code></em>);
-<a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="returnvalue">gchar</span></a>*              <a class="link" href="glib-Character-Set-Conversion.html#g-locale-from-utf8" title="g_locale_from_utf8 ()">g_locale_from_utf8</a>                  (<em class="parameter"><code>const <a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="type">gchar</span></a> *utf8string</code></em>,
+<a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="returnvalue">gchar</span></a> *             <a class="link" href="glib-Character-Set-Conversion.html#g-locale-from-utf8" title="g_locale_from_utf8 ()">g_locale_from_utf8</a>                  (<em class="parameter"><code>const <a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="type">gchar</span></a> *utf8string</code></em>,
                                                          <em class="parameter"><code><a class="link" href="glib-Basic-Types.html#gssize" title="gssize"><span class="type">gssize</span></a> len</code></em>,
                                                          <em class="parameter"><code><a class="link" href="glib-Basic-Types.html#gsize" title="gsize"><span class="type">gsize</span></a> *bytes_read</code></em>,
                                                          <em class="parameter"><code><a class="link" href="glib-Basic-Types.html#gsize" title="gsize"><span class="type">gsize</span></a> *bytes_written</code></em>,
@@ -105,136 +99,132 @@ enum                <a class="link" href="glib-Character-Set-Conversion.html#GCo
 <a class="link" href="glib-Basic-Types.html#gboolean" title="gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="glib-Character-Set-Conversion.html#g-get-charset" title="g_get_charset ()">g_get_charset</a>                       (<em class="parameter"><code>G_CONST_RETURN <span class="type">char</span> **charset</code></em>);
 </pre>
 </div>
-<div class="refsect1" title="Description">
+<div class="refsect1">
 <a name="glib-Character-Set-Conversion.description"></a><h2>Description</h2>
 <p>
+The <a class="link" href="glib-Character-Set-Conversion.html#g-convert" title="g_convert ()"><code class="function">g_convert()</code></a> family of function wraps the functionality of <code class="function">iconv()</code>. In
+addition to pure character set conversions, GLib has functions to deal
+with the extra complications of encodings for file names.
 </p>
-<div class="refsect2" title="File Name Encodings">
+<p>
+</p>
+<div class="refsect2">
 <a name="file-name-encodings"></a><h3>File Name Encodings</h3>
 <p>
-	Historically, Unix has not had a defined encoding for file
-	names:  a file name is valid as long as it does not have path
-	separators in it ("/").  However, displaying file names may
-	require conversion:  from the character set in which they were
-	created, to the character set in which the application
-	operates.  Consider the Spanish file name
-	"<code class="filename">Presentación.sxi</code>".  If the
-	application which created it uses ISO-8859-1 for its encoding,
-	then the actual file name on disk would look like this:
-      </p>
+Historically, Unix has not had a defined encoding for file
+names:  a file name is valid as long as it does not have path
+separators in it ("/").  However, displaying file names may
+require conversion:  from the character set in which they were
+created, to the character set in which the application
+operates.  Consider the Spanish file name
+"<code class="filename">Presentación.sxi</code>".  If the
+application which created it uses ISO-8859-1 for its encoding,
+</p>
 <a name="filename-iso8859-1"></a><pre class="programlisting">
 Character:  P  r  e  s  e  n  t  a  c  i  ó  n  .  s  x  i
 Hex code:   50 72 65 73 65 6e 74 61 63 69 f3 6e 2e 73 78 69
-      </pre>
+</pre>
 <p>
-	However, if the application use UTF-8, the actual file name on
-	disk would look like this:
-      </p>
+However, if the application use UTF-8, the actual file name on
+disk would look like this:
+</p>
 <a name="filename-utf-8"></a><pre class="programlisting">
 Character:  P  r  e  s  e  n  t  a  c  i  ó     n  .  s  x  i
 Hex code:   50 72 65 73 65 6e 74 61 63 69 c3 b3 6e 2e 73 78 69
-      </pre>
+</pre>
 <p>
-	Glib uses UTF-8 for its strings, and GUI toolkits like GTK+
-	that use Glib do the same thing.  If you get a file name from
-	the file system, for example, from
-	<code class="function">readdir(3)</code> or from <code class="function"><a class="link" href="glib-File-Utilities.html#g-dir-read-name" title="g_dir_read_name ()"><code class="function">g_dir_read_name()</code></a></code>,
-	and you wish to display the file name to the user, you
-	<span class="emphasis"><em>will</em></span> need to convert it into UTF-8.  The
-	opposite case is when the user types the name of a file he
-	wishes to save:  the toolkit will give you that string in
-	UTF-8 encoding, and you will need to convert it to the
-	character set used for file names before you can create the
-	file with <code class="function">open(2)</code> or
-	<code class="function">fopen(3)</code>.
-      </p>
+Glib uses UTF-8 for its strings, and GUI toolkits like GTK+
+that use Glib do the same thing.  If you get a file name from
+the file system, for example, from readdir(3) or from <a class="link" href="glib-File-Utilities.html#g-dir-read-name" title="g_dir_read_name ()"><code class="function">g_dir_read_name()</code></a>,
+and you wish to display the file name to the user, you
+<span class="emphasis"><em>will</em></span> need to convert it into UTF-8.  The
+opposite case is when the user types the name of a file he
+wishes to save:  the toolkit will give you that string in
+UTF-8 encoding, and you will need to convert it to the
+character set used for file names before you can create the
+file with open(2) or fopen(3).
+</p>
 <p>
-	By default, Glib assumes that file names on disk are in UTF-8
-	encoding.  This is a valid assumption for file systems which
-	were created relatively recently:  most applications use UTF-8
-	encoding for their strings, and that is also what they use for
-	the file names they create.  However, older file systems may
-	still contain file names created in "older" encodings, such as
-	ISO-8859-1.  In this case, for compatibility reasons, you may
-	want to instruct Glib to use that particular encoding for file
-	names rather than UTF-8.  You can do this by specifying the
-	encoding for file names in the <a class="link" href="glib-running.html#G_FILENAME_ENCODING" title="G_FILENAME_ENCODING"><code class="envar">G_FILENAME_ENCODING</code></a>
-	environment variable.  For example, if your installation uses
-	ISO-8859-1 for file names, you can put this in your
-	<code class="filename">~/.profile</code>:
-      </p>
+By default, Glib assumes that file names on disk are in UTF-8
+encoding.  This is a valid assumption for file systems which
+were created relatively recently:  most applications use UTF-8
+encoding for their strings, and that is also what they use for
+the file names they create.  However, older file systems may
+still contain file names created in "older" encodings, such as
+ISO-8859-1. In this case, for compatibility reasons, you may
+want to instruct Glib to use that particular encoding for file
+names rather than UTF-8.  You can do this by specifying the
+encoding for file names in the <a class="link" href="glib-running.html#G_FILENAME_ENCODING" title="G_FILENAME_ENCODING"><code class="envar">G_FILENAME_ENCODING</code></a>
+environment variable.  For example, if your installation uses
+ISO-8859-1 for file names, you can put this in your
+<code class="filename">~/.profile</code>:
+</p>
 <pre class="programlisting">
 export G_FILENAME_ENCODING=ISO-8859-1
-      </pre>
+</pre>
 <p>
-	Glib provides the functions <code class="function"><a class="link" href="glib-Character-Set-Conversion.html#g-filename-to-utf8" title="g_filename_to_utf8 ()"><code class="function">g_filename_to_utf8()</code></a></code>
-	and <code class="function"><a class="link" href="glib-Character-Set-Conversion.html#g-filename-from-utf8" title="g_filename_from_utf8 ()"><code class="function">g_filename_from_utf8()</code></a></code>
-	to perform the necessary conversions.  These functions convert
-	file names from the encoding specified in
-	<code class="envar">G_FILENAME_ENCODING</code> to UTF-8 and vice-versa.
-	<a class="xref" href="glib-Character-Set-Conversion.html#file-name-encodings-diagram" title="Figure 2. Conversion between File Name Encodings">Figure 2, “Conversion between File Name Encodings”</a> illustrates how
-	these functions are used to convert between UTF-8 and the
-	encoding for file names in the file system.
-      </p>
+Glib provides the functions <a class="link" href="glib-Character-Set-Conversion.html#g-filename-to-utf8" title="g_filename_to_utf8 ()"><code class="function">g_filename_to_utf8()</code></a> and
+<a class="link" href="glib-Character-Set-Conversion.html#g-filename-from-utf8" title="g_filename_from_utf8 ()"><code class="function">g_filename_from_utf8()</code></a> to perform the necessary conversions. These
+functions convert file names from the encoding specified in
+<code class="envar">G_FILENAME_ENCODING</code> to UTF-8 and vice-versa.
+<a class="xref" href="glib-Character-Set-Conversion.html#file-name-encodings-diagram" title="Figure 2. Conversion between File Name Encodings">Figure 2, “Conversion between File Name Encodings”</a> illustrates how
+these functions are used to convert between UTF-8 and the
+encoding for file names in the file system.
+</p>
 <div class="figure">
 <a name="file-name-encodings-diagram"></a><p class="title"><b>Figure 2. Conversion between File Name Encodings</b></p>
 <div class="figure-contents"><div><img src="file-name-encodings.png" alt="Conversion between File Name Encodings"></div></div>
 </div>
-<br class="figure-break"><div class="refsect3" title="Checklist for Application Writers">
+<br class="figure-break"><div class="refsect3">
 <a name="file-name-encodings-checklist"></a><h4>Checklist for Application Writers</h4>
 <p>
-	  This section is a practical summary of the detailed
-	  description above.  You can use this as a checklist of
-	  things to do to make sure your applications process file
-	  name encodings correctly.
-	</p>
+This section is a practical summary of the detailed
+description above.  You can use this as a checklist of
+things to do to make sure your applications process file
+name encodings correctly.
+</p>
 <div class="orderedlist"><ol class="orderedlist" type="1">
 <li class="listitem"><p>
-	      If you get a file name from the file system from a
-	      function such as <code class="function">readdir(3)</code> or
-	      <code class="function"><code class="function">gtk_file_chooser_get_filename()</code></code>,
-	      you do not need to do any conversion to pass that
-	      file name to functions like <code class="function">open(2)</code>,
-	      <code class="function">rename(2)</code>, or
-	      <code class="function">fopen(3)</code> — those are "raw"
-	      file names which the file system understands.
-	    </p></li>
+If you get a file name from the file system from a function
+such as readdir(3) or <a href="http://library.gnome.org/devel/gtk/unstable/GtkFileChooser.html#gtk-file-chooser-get-filename"><code class="function">gtk_file_chooser_get_filename()</code></a>,
+you do not need to do any conversion to pass that
+file name to functions like open(2), rename(2), or
+fopen(3) — those are "raw" file names which the file
+system understands.
+</p></li>
 <li class="listitem"><p>
-	      If you need to display a file name, convert it to UTF-8
-	      first by using <code class="function"><a class="link" href="glib-Character-Set-Conversion.html#g-filename-to-utf8" title="g_filename_to_utf8 ()"><code class="function">g_filename_to_utf8()</code></a></code>.
-	      If conversion fails, display a string like
-	      "<code class="literal">Unknown file name</code>".  <span class="emphasis"><em>Do
-	      not</em></span> convert this string back into the
-	      encoding used for file names if you wish to pass it to
-	      the file system; use the original file name instead.
-	      For example, the document window of a word processor
-	      could display "Unknown file name" in its title bar but
-	      still let the user save the file, as it would keep the
-	      raw file name internally.  This can happen if the user
-	      has not set the <code class="envar">G_FILENAME_ENCODING</code>
-	      environment variable even though he has files whose
-	      names are not encoded in UTF-8.
-	    </p></li>
+If you need to display a file name, convert it to UTF-8 first by
+using <a class="link" href="glib-Character-Set-Conversion.html#g-filename-to-utf8" title="g_filename_to_utf8 ()"><code class="function">g_filename_to_utf8()</code></a>. If conversion fails, display a string like
+"<code class="literal">Unknown file name</code>". <span class="emphasis"><em>Do not</em></span>
+convert this string back into the encoding used for file names if you
+wish to pass it to the file system; use the original file name instead.
+For example, the document window of a word processor could display
+"Unknown file name" in its title bar but still let the user save the
+file, as it would keep the raw file name internally. This can happen
+if the user has not set the <code class="envar">G_FILENAME_ENCODING</code>
+environment variable even though he has files whose names are not
+encoded in UTF-8.
+</p></li>
 <li class="listitem"><p>
-	      If your user interface lets the user type a file name
-	      for saving or renaming, convert it to the encoding used
-	      for file names in the file system by using <code class="function"><a class="link" href="glib-Character-Set-Conversion.html#g-filename-from-utf8" title="g_filename_from_utf8 ()"><code class="function">g_filename_from_utf8()</code></a></code>.
-	      Pass the converted file name to functions like
-	      <code class="function">fopen(3)</code>.  If conversion fails, ask
-	      the user to enter a different file name.  This can
-	      happen if the user types Japanese characters when
-	      <code class="envar">G_FILENAME_ENCODING</code> is set to
-	      <code class="literal">ISO-8859-1</code>, for example.
-	    </p></li>
+If your user interface lets the user type a file name for saving or
+renaming, convert it to the encoding used for file names in the file
+system by using <a class="link" href="glib-Character-Set-Conversion.html#g-filename-from-utf8" title="g_filename_from_utf8 ()"><code class="function">g_filename_from_utf8()</code></a>. Pass the converted file name
+to functions like fopen(3). If conversion fails, ask the user to enter
+a different file name. This can happen if the user types Japanese
+characters when <code class="envar">G_FILENAME_ENCODING</code> is set to
+<code class="literal">ISO-8859-1</code>, for example.
+</p></li>
 </ol></div>
 </div>
 </div>
+<p>
+</p>
 </div>
-<div class="refsect1" title="Details">
+<div class="refsect1">
 <a name="glib-Character-Set-Conversion.details"></a><h2>Details</h2>
-<div class="refsect2" title="g_convert ()">
+<div class="refsect2">
 <a name="g-convert"></a><h3>g_convert ()</h3>
-<pre class="programlisting"><a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="returnvalue">gchar</span></a>*              g_convert                           (<em class="parameter"><code>const <a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="type">gchar</span></a> *str</code></em>,
+<pre class="programlisting"><a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="returnvalue">gchar</span></a> *             g_convert                           (<em class="parameter"><code>const <a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="type">gchar</span></a> *str</code></em>,
                                                          <em class="parameter"><code><a class="link" href="glib-Basic-Types.html#gssize" title="gssize"><span class="type">gssize</span></a> len</code></em>,
                                                          <em class="parameter"><code>const <a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="type">gchar</span></a> *to_codeset</code></em>,
                                                          <em class="parameter"><code>const <a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="type">gchar</span></a> *from_codeset</code></em>,
@@ -307,9 +297,9 @@ conversions<sup>[<a href="glib-Character-Set-Conversion.html#ftn.streaming-state
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="g_convert_with_fallback ()">
+<div class="refsect2">
 <a name="g-convert-with-fallback"></a><h3>g_convert_with_fallback ()</h3>
-<pre class="programlisting"><a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="returnvalue">gchar</span></a>*              g_convert_with_fallback             (<em class="parameter"><code>const <a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="type">gchar</span></a> *str</code></em>,
+<pre class="programlisting"><a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="returnvalue">gchar</span></a> *             g_convert_with_fallback             (<em class="parameter"><code>const <a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="type">gchar</span></a> *str</code></em>,
                                                          <em class="parameter"><code><a class="link" href="glib-Basic-Types.html#gssize" title="gssize"><span class="type">gssize</span></a> len</code></em>,
                                                          <em class="parameter"><code>const <a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="type">gchar</span></a> *to_codeset</code></em>,
                                                          <em class="parameter"><code>const <a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="type">gchar</span></a> *from_codeset</code></em>,
@@ -395,19 +385,16 @@ conversions<sup>[<a href="glib-Character-Set-Conversion.html#ftn.streaming-state
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="GIConv">
+<div class="refsect2">
 <a name="GIConv"></a><h3>GIConv</h3>
 <pre class="programlisting">typedef struct _GIConv GIConv;</pre>
 <p>
-The <span class="structname">GIConv</span> struct wraps an
-<code class="function"><code class="function">iconv()</code></code> conversion descriptor. It contains private data
-and should only be accessed using the following functions.
 </p>
 </div>
 <hr>
-<div class="refsect2" title="g_convert_with_iconv ()">
+<div class="refsect2">
 <a name="g-convert-with-iconv"></a><h3>g_convert_with_iconv ()</h3>
-<pre class="programlisting"><a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="returnvalue">gchar</span></a>*              g_convert_with_iconv                (<em class="parameter"><code>const <a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="type">gchar</span></a> *str</code></em>,
+<pre class="programlisting"><a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="returnvalue">gchar</span></a> *             g_convert_with_iconv                (<em class="parameter"><code>const <a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="type">gchar</span></a> *str</code></em>,
                                                          <em class="parameter"><code><a class="link" href="glib-Basic-Types.html#gssize" title="gssize"><span class="type">gssize</span></a> len</code></em>,
                                                          <em class="parameter"><code><a class="link" href="glib-Character-Set-Conversion.html#GIConv" title="GIConv"><span class="type">GIConv</span></a> converter</code></em>,
                                                          <em class="parameter"><code><a class="link" href="glib-Basic-Types.html#gsize" title="gsize"><span class="type">gsize</span></a> *bytes_read</code></em>,
@@ -474,7 +461,7 @@ conversions<sup>[<a name="streaming-state" href="#ftn.streaming-state" class="fo
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="G_CONVERT_ERROR">
+<div class="refsect2">
 <a name="G-CONVERT-ERROR:CAPS"></a><h3>G_CONVERT_ERROR</h3>
 <pre class="programlisting">#define G_CONVERT_ERROR g_convert_error_quark()
 </pre>
@@ -485,7 +472,7 @@ error domains.
 </p>
 </div>
 <hr>
-<div class="refsect2" title="g_iconv_open ()">
+<div class="refsect2">
 <a name="g-iconv-open"></a><h3>g_iconv_open ()</h3>
 <pre class="programlisting"><a class="link" href="glib-Character-Set-Conversion.html#GIConv" title="GIConv"><span class="returnvalue">GIConv</span></a>              g_iconv_open                        (<em class="parameter"><code>const <a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="type">gchar</span></a> *to_codeset</code></em>,
                                                          <em class="parameter"><code>const <a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="type">gchar</span></a> *from_codeset</code></em>);</pre>
@@ -521,7 +508,7 @@ more convenient than the raw iconv wrappers.
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="g_iconv ()">
+<div class="refsect2">
 <a name="g-iconv"></a><h3>g_iconv ()</h3>
 <pre class="programlisting"><a class="link" href="glib-Basic-Types.html#gsize" title="gsize"><span class="returnvalue">gsize</span></a>               g_iconv                             (<em class="parameter"><code><a class="link" href="glib-Character-Set-Conversion.html#GIConv" title="GIConv"><span class="type">GIConv</span></a> converter</code></em>,
                                                          <em class="parameter"><code><a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="type">gchar</span></a> **inbuf</code></em>,
@@ -574,7 +561,7 @@ more convenient than the raw iconv wrappers.
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="g_iconv_close ()">
+<div class="refsect2">
 <a name="g-iconv-close"></a><h3>g_iconv_close ()</h3>
 <pre class="programlisting"><a class="link" href="glib-Basic-Types.html#gint" title="gint"><span class="returnvalue">gint</span></a>                g_iconv_close                       (<em class="parameter"><code><a class="link" href="glib-Character-Set-Conversion.html#GIConv" title="GIConv"><span class="type">GIConv</span></a> converter</code></em>);</pre>
 <p>
@@ -605,9 +592,9 @@ more convenient than the raw iconv wrappers.
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="g_locale_to_utf8 ()">
+<div class="refsect2">
 <a name="g-locale-to-utf8"></a><h3>g_locale_to_utf8 ()</h3>
-<pre class="programlisting"><a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="returnvalue">gchar</span></a>*              g_locale_to_utf8                    (<em class="parameter"><code>const <a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="type">gchar</span></a> *opsysstring</code></em>,
+<pre class="programlisting"><a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="returnvalue">gchar</span></a> *             g_locale_to_utf8                    (<em class="parameter"><code>const <a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="type">gchar</span></a> *opsysstring</code></em>,
                                                          <em class="parameter"><code><a class="link" href="glib-Basic-Types.html#gssize" title="gssize"><span class="type">gssize</span></a> len</code></em>,
                                                          <em class="parameter"><code><a class="link" href="glib-Basic-Types.html#gsize" title="gsize"><span class="type">gsize</span></a> *bytes_read</code></em>,
                                                          <em class="parameter"><code><a class="link" href="glib-Basic-Types.html#gsize" title="gsize"><span class="type">gsize</span></a> *bytes_written</code></em>,
@@ -666,9 +653,9 @@ UTF-8 string.
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="g_filename_to_utf8 ()">
+<div class="refsect2">
 <a name="g-filename-to-utf8"></a><h3>g_filename_to_utf8 ()</h3>
-<pre class="programlisting"><a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="returnvalue">gchar</span></a>*              g_filename_to_utf8                  (<em class="parameter"><code>const <a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="type">gchar</span></a> *opsysstring</code></em>,
+<pre class="programlisting"><a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="returnvalue">gchar</span></a> *             g_filename_to_utf8                  (<em class="parameter"><code>const <a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="type">gchar</span></a> *opsysstring</code></em>,
                                                          <em class="parameter"><code><a class="link" href="glib-Basic-Types.html#gssize" title="gssize"><span class="type">gssize</span></a> len</code></em>,
                                                          <em class="parameter"><code><a class="link" href="glib-Basic-Types.html#gsize" title="gsize"><span class="type">gsize</span></a> *bytes_read</code></em>,
                                                          <em class="parameter"><code><a class="link" href="glib-Basic-Types.html#gsize" title="gsize"><span class="type">gsize</span></a> *bytes_written</code></em>,
@@ -726,9 +713,9 @@ the <a class="link" href="glib-running.html#setlocale" title="Locale">current lo
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="g_filename_from_utf8 ()">
+<div class="refsect2">
 <a name="g-filename-from-utf8"></a><h3>g_filename_from_utf8 ()</h3>
-<pre class="programlisting"><a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="returnvalue">gchar</span></a>*              g_filename_from_utf8                (<em class="parameter"><code>const <a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="type">gchar</span></a> *utf8string</code></em>,
+<pre class="programlisting"><a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="returnvalue">gchar</span></a> *             g_filename_from_utf8                (<em class="parameter"><code>const <a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="type">gchar</span></a> *utf8string</code></em>,
                                                          <em class="parameter"><code><a class="link" href="glib-Basic-Types.html#gssize" title="gssize"><span class="type">gssize</span></a> len</code></em>,
                                                          <em class="parameter"><code><a class="link" href="glib-Basic-Types.html#gsize" title="gsize"><span class="type">gsize</span></a> *bytes_read</code></em>,
                                                          <em class="parameter"><code><a class="link" href="glib-Basic-Types.html#gsize" title="gsize"><span class="type">gsize</span></a> *bytes_written</code></em>,
@@ -786,87 +773,7 @@ on other platforms, this function indirectly depends on the
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="g_filename_from_uri ()">
-<a name="g-filename-from-uri"></a><h3>g_filename_from_uri ()</h3>
-<pre class="programlisting"><a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="returnvalue">gchar</span></a> *             g_filename_from_uri                 (<em class="parameter"><code>const <a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="type">gchar</span></a> *uri</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="type">gchar</span></a> **hostname</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="glib-Error-Reporting.html#GError" title="GError"><span class="type">GError</span></a> **error</code></em>);</pre>
-<p>
-Converts an escaped ASCII-encoded URI to a local filename in the
-encoding used for filenames.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>uri</code></em> :</span></p></td>
-<td>a uri describing a filename (escaped, encoded in ASCII).
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>hostname</code></em> :</span></p></td>
-<td>Location to store hostname for the URI, or <a class="link" href="glib-Standard-Macros.html#NULL:CAPS" title="NULL"><code class="literal">NULL</code></a>.
-           If there is no hostname in the URI, <a class="link" href="glib-Standard-Macros.html#NULL:CAPS" title="NULL"><code class="literal">NULL</code></a> will be
-           stored in this location.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>location to store the error occuring, or <a class="link" href="glib-Standard-Macros.html#NULL:CAPS" title="NULL"><code class="literal">NULL</code></a> to ignore
-        errors. Any of the errors in <a class="link" href="glib-Character-Set-Conversion.html#GConvertError" title="enum GConvertError"><span class="type">GConvertError</span></a> may occur.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a newly-allocated string holding the resulting
-              filename, or <a class="link" href="glib-Standard-Macros.html#NULL:CAPS" title="NULL"><code class="literal">NULL</code></a> on an error.
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="g_filename_to_uri ()">
-<a name="g-filename-to-uri"></a><h3>g_filename_to_uri ()</h3>
-<pre class="programlisting"><a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="returnvalue">gchar</span></a> *             g_filename_to_uri                   (<em class="parameter"><code>const <a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="type">gchar</span></a> *filename</code></em>,
-                                                         <em class="parameter"><code>const <a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="type">gchar</span></a> *hostname</code></em>,
-                                                         <em class="parameter"><code><a class="link" href="glib-Error-Reporting.html#GError" title="GError"><span class="type">GError</span></a> **error</code></em>);</pre>
-<p>
-Converts an absolute filename to an escaped ASCII-encoded URI, with the path
-component following Section 3.3. of RFC 2396.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>filename</code></em> :</span></p></td>
-<td>an absolute filename specified in the GLib file name encoding,
-           which is the on-disk file name bytes on Unix, and UTF-8 on
-           Windows
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>hostname</code></em> :</span></p></td>
-<td>A UTF-8 encoded hostname, or <a class="link" href="glib-Standard-Macros.html#NULL:CAPS" title="NULL"><code class="literal">NULL</code></a> for none.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td>location to store the error occuring, or <a class="link" href="glib-Standard-Macros.html#NULL:CAPS" title="NULL"><code class="literal">NULL</code></a> to ignore
-        errors. Any of the errors in <a class="link" href="glib-Character-Set-Conversion.html#GConvertError" title="enum GConvertError"><span class="type">GConvertError</span></a> may occur.
-</td>
-</tr>
-<tr>
-<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a newly-allocated string holding the resulting
-              URI, or <a class="link" href="glib-Standard-Macros.html#NULL:CAPS" title="NULL"><code class="literal">NULL</code></a> on an error.
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" title="g_get_filename_charsets ()">
+<div class="refsect2">
 <a name="g-get-filename-charsets"></a><h3>g_get_filename_charsets ()</h3>
 <pre class="programlisting"><a class="link" href="glib-Basic-Types.html#gboolean" title="gboolean"><span class="returnvalue">gboolean</span></a>            g_get_filename_charsets             (<em class="parameter"><code>G_CONST_RETURN <a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="type">gchar</span></a> ***charsets</code></em>);</pre>
 <p>
@@ -919,7 +826,7 @@ on a system might be in any random encoding or just gibberish.
 <p class="since">Since 2.6</p>
 </div>
 <hr>
-<div class="refsect2" title="g_filename_display_name ()">
+<div class="refsect2">
 <a name="g-filename-display-name"></a><h3>g_filename_display_name ()</h3>
 <pre class="programlisting"><a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="returnvalue">gchar</span></a> *             g_filename_display_name             (<em class="parameter"><code>const <a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="type">gchar</span></a> *filename</code></em>);</pre>
 <p>
@@ -961,7 +868,7 @@ translation of filenames.
 <p class="since">Since 2.6</p>
 </div>
 <hr>
-<div class="refsect2" title="g_filename_display_basename ()">
+<div class="refsect2">
 <a name="g-filename-display-basename"></a><h3>g_filename_display_basename ()</h3>
 <pre class="programlisting"><a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="returnvalue">gchar</span></a> *             g_filename_display_basename         (<em class="parameter"><code>const <a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="type">gchar</span></a> *filename</code></em>);</pre>
 <p>
@@ -1005,9 +912,9 @@ whole path, as it allows translation.
 <p class="since">Since 2.6</p>
 </div>
 <hr>
-<div class="refsect2" title="g_locale_from_utf8 ()">
+<div class="refsect2">
 <a name="g-locale-from-utf8"></a><h3>g_locale_from_utf8 ()</h3>
-<pre class="programlisting"><a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="returnvalue">gchar</span></a>*              g_locale_from_utf8                  (<em class="parameter"><code>const <a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="type">gchar</span></a> *utf8string</code></em>,
+<pre class="programlisting"><a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="returnvalue">gchar</span></a> *             g_locale_from_utf8                  (<em class="parameter"><code>const <a class="link" href="glib-Basic-Types.html#gchar" title="gchar"><span class="type">gchar</span></a> *utf8string</code></em>,
                                                          <em class="parameter"><code><a class="link" href="glib-Basic-Types.html#gssize" title="gssize"><span class="type">gssize</span></a> len</code></em>,
                                                          <em class="parameter"><code><a class="link" href="glib-Basic-Types.html#gsize" title="gsize"><span class="type">gsize</span></a> *bytes_read</code></em>,
                                                          <em class="parameter"><code><a class="link" href="glib-Basic-Types.html#gsize" title="gsize"><span class="type">gsize</span></a> *bytes_written</code></em>,
@@ -1065,9 +972,9 @@ Windows this means the system codepage.
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="enum GConvertError">
+<div class="refsect2">
 <a name="GConvertError"></a><h3>enum GConvertError</h3>
-<pre class="programlisting">typedef enum
+<pre class="programlisting">typedef enum
 {
   G_CONVERT_ERROR_NO_CONVERSION,
   G_CONVERT_ERROR_ILLEGAL_SEQUENCE,
@@ -1085,8 +992,8 @@ Error codes returned by character set conversion routines.
 <tbody>
 <tr>
 <td><p><a name="G-CONVERT-ERROR-NO-CONVERSION:CAPS"></a><span class="term"><code class="literal">G_CONVERT_ERROR_NO_CONVERSION</code></span></p></td>
-<td>Conversion between the requested character sets
-is not supported.
+<td>Conversion between the requested character
+    sets is not supported.
 </td>
 </tr>
 <tr>
@@ -1118,7 +1025,7 @@ is not supported.
 </table></div>
 </div>
 <hr>
-<div class="refsect2" title="g_get_charset ()">
+<div class="refsect2">
 <a name="g-get-charset"></a><h3>g_get_charset ()</h3>
 <pre class="programlisting"><a class="link" href="glib-Basic-Types.html#gboolean" title="gboolean"><span class="returnvalue">gboolean</span></a>            g_get_charset                       (<em class="parameter"><code>G_CONST_RETURN <span class="type">char</span> **charset</code></em>);</pre>
 <p>
@@ -1182,6 +1089,6 @@ character.)
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.14</div>
+          Generated by GTK-Doc V1.15.1</div>
 </body>
 </html>