RubyGems - glib2 - Versions diffs - 0.90.8-x86-mingw32 → 0.90.9-x86-mingw32 - Mend

glib2 0.90.8-x86-mingw32 → 0.90.9-x86-mingw32

Files changed (620) hide show

data/vendor/local/share/gtk-doc/html/gio/GProxyAddress.html CHANGED

@@ -8,7 +8,7 @@
 <link rel="up" href="networking.html" title="Lowlevel network support">
 <link rel="prev" href="GProxy.html" title="GProxy">
 <link rel="next" href="highlevel-socket.html" title="Highlevel network functionallity">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.16.1 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -32,7 +32,7 @@
                   <a href="#GProxyAddress.properties" class="shortcut">Properties</a>
 </td></tr>
 </table>
-<div class="refentry" title="GProxyAddress">
+<div class="refentry">
 <a name="GProxyAddress"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
@@ -41,10 +41,10 @@
 </td>
 <td valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
+<div class="refsynopsisdiv">
 <a name="GProxyAddress.synopsis"></a><h2>Synopsis</h2>
 <pre class="synopsis">                    <a class="link" href="GProxyAddress.html#GProxyAddress-struct" title="GProxyAddress">GProxyAddress</a>;
-                    <a class="link" href="GProxyAddress.html#GProxyAddressClass" title="GProxyAddressClass">GProxyAddressClass</a>;
+struct              <a class="link" href="GProxyAddress.html#GProxyAddressClass" title="struct GProxyAddressClass">GProxyAddressClass</a>;
 const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *       <a class="link" href="GProxyAddress.html#g-proxy-address-get-destination-hostname" title="g_proxy_address_get_destination_hostname ()">g_proxy_address_get_destination_hostname</a>
                                                         (<em class="parameter"><code><a class="link" href="GProxyAddress.html" title="GProxyAddress"><span class="type">GProxyAddress</span></a> *proxy</code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint16"><span class="returnvalue">guint16</span></a>             <a class="link" href="GProxyAddress.html#g-proxy-address-get-destination-port" title="g_proxy_address_get_destination_port ()">g_proxy_address_get_destination_port</a>
@@ -61,7 +61,7 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.htm
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *password</code></em>);
 </pre>
 </div>
-<div class="refsect1" title="Object Hierarchy">
+<div class="refsect1">
 <a name="GProxyAddress.object-hierarchy"></a><h2>Object Hierarchy</h2>
 <pre class="synopsis">
   <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>
@@ -70,13 +70,13 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.htm
                +----GProxyAddress
 </pre>
 </div>
-<div class="refsect1" title="Implemented Interfaces">
+<div class="refsect1">
 <a name="GProxyAddress.implemented-interfaces"></a><h2>Implemented Interfaces</h2>
 <p>
 GProxyAddress implements
  <a class="link" href="GSocketConnectable.html" title="GSocketConnectable">GSocketConnectable</a>.</p>
 </div>
-<div class="refsect1" title="Properties">
+<div class="refsect1">
 <a name="GProxyAddress.properties"></a><h2>Properties</h2>
 <pre class="synopsis">
   "<a class="link" href="GProxyAddress.html#GProxyAddress--destination-hostname" title='The "destination-hostname" property'>destination-hostname</a>"     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write / Construct Only
@@ -86,15 +86,15 @@ GProxyAddress implements
   "<a class="link" href="GProxyAddress.html#GProxyAddress--username" title='The "username" property'>username</a>"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write / Construct Only
 </pre>
 </div>
-<div class="refsect1" title="Description">
+<div class="refsect1">
 <a name="GProxyAddress.description"></a><h2>Description</h2>
 <p>
 Support for proxied <a class="link" href="GInetSocketAddress.html" title="GInetSocketAddress"><span class="type">GInetSocketAddress</span></a>.
 </p>
 </div>
-<div class="refsect1" title="Details">
+<div class="refsect1">
 <a name="GProxyAddress.details"></a><h2>Details</h2>
-<div class="refsect2" title="GProxyAddress">
+<div class="refsect2">
 <a name="GProxyAddress-struct"></a><h3>GProxyAddress</h3>
 <pre class="programlisting">typedef struct _GProxyAddress GProxyAddress;</pre>
 <p>
@@ -103,17 +103,17 @@ A <a class="link" href="GInetSocketAddress.html" title="GInetSocketAddress"><spa
 <p class="since">Since 2.26</p>
 </div>
 <hr>
-<div class="refsect2" title="GProxyAddressClass">
-<a name="GProxyAddressClass"></a><h3>GProxyAddressClass</h3>
-<pre class="programlisting">typedef struct {
+<div class="refsect2">
+<a name="GProxyAddressClass"></a><h3>struct GProxyAddressClass</h3>
+<pre class="programlisting">struct GProxyAddressClass {
   GInetSocketAddressClass parent_class;
-} GProxyAddressClass;
+};
 </pre>
 <p>
 </p>
 </div>
 <hr>
-<div class="refsect2" title="g_proxy_address_get_destination_hostname ()">
+<div class="refsect2">
 <a name="g-proxy-address-get-destination-hostname"></a><h3>g_proxy_address_get_destination_hostname ()</h3>
 <pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *       g_proxy_address_get_destination_hostname
                                                         (<em class="parameter"><code><a class="link" href="GProxyAddress.html" title="GProxyAddress"><span class="type">GProxyAddress</span></a> *proxy</code></em>);</pre>
@@ -130,16 +130,14 @@ Gets <em class="parameter"><code>proxy</code></em>'s destination hostname.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the <em class="parameter"><code>proxy</code></em>'s destination hostname
-</td>
+<td>the <em class="parameter"><code>proxy</code></em>'s destination hostname</td>
 </tr>
 </tbody>
 </table></div>
 <p class="since">Since 2.26</p>
 </div>
 <hr>
-<div class="refsect2" title="g_proxy_address_get_destination_port ()">
+<div class="refsect2">
 <a name="g-proxy-address-get-destination-port"></a><h3>g_proxy_address_get_destination_port ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint16"><span class="returnvalue">guint16</span></a>             g_proxy_address_get_destination_port
                                                         (<em class="parameter"><code><a class="link" href="GProxyAddress.html" title="GProxyAddress"><span class="type">GProxyAddress</span></a> *proxy</code></em>);</pre>
@@ -156,16 +154,14 @@ Gets <em class="parameter"><code>proxy</code></em>'s destination port.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the <em class="parameter"><code>proxy</code></em>'s destination port
-</td>
+<td>the <em class="parameter"><code>proxy</code></em>'s destination port</td>
 </tr>
 </tbody>
 </table></div>
 <p class="since">Since 2.26</p>
 </div>
 <hr>
-<div class="refsect2" title="g_proxy_address_get_password ()">
+<div class="refsect2">
 <a name="g-proxy-address-get-password"></a><h3>g_proxy_address_get_password ()</h3>
 <pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *       g_proxy_address_get_password        (<em class="parameter"><code><a class="link" href="GProxyAddress.html" title="GProxyAddress"><span class="type">GProxyAddress</span></a> *proxy</code></em>);</pre>
 <p>
@@ -181,16 +177,14 @@ Gets <em class="parameter"><code>proxy</code></em>'s password.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the <em class="parameter"><code>proxy</code></em>'s password
-</td>
+<td>the <em class="parameter"><code>proxy</code></em>'s password</td>
 </tr>
 </tbody>
 </table></div>
 <p class="since">Since 2.26</p>
 </div>
 <hr>
-<div class="refsect2" title="g_proxy_address_get_protocol ()">
+<div class="refsect2">
 <a name="g-proxy-address-get-protocol"></a><h3>g_proxy_address_get_protocol ()</h3>
 <pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *       g_proxy_address_get_protocol        (<em class="parameter"><code><a class="link" href="GProxyAddress.html" title="GProxyAddress"><span class="type">GProxyAddress</span></a> *proxy</code></em>);</pre>
 <p>
@@ -206,16 +200,14 @@ Gets <em class="parameter"><code>proxy</code></em>'s protocol.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the <em class="parameter"><code>proxy</code></em>'s protocol
-</td>
+<td>the <em class="parameter"><code>proxy</code></em>'s protocol</td>
 </tr>
 </tbody>
 </table></div>
 <p class="since">Since 2.26</p>
 </div>
 <hr>
-<div class="refsect2" title="g_proxy_address_get_username ()">
+<div class="refsect2">
 <a name="g-proxy-address-get-username"></a><h3>g_proxy_address_get_username ()</h3>
 <pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *       g_proxy_address_get_username        (<em class="parameter"><code><a class="link" href="GProxyAddress.html" title="GProxyAddress"><span class="type">GProxyAddress</span></a> *proxy</code></em>);</pre>
 <p>
@@ -231,16 +223,14 @@ Gets <em class="parameter"><code>proxy</code></em>'s username.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the <em class="parameter"><code>proxy</code></em>'s username
-</td>
+<td>the <em class="parameter"><code>proxy</code></em>'s username</td>
 </tr>
 </tbody>
 </table></div>
 <p class="since">Since 2.26</p>
 </div>
 <hr>
-<div class="refsect2" title="g_proxy_address_new ()">
+<div class="refsect2">
 <a name="g-proxy-address-new"></a><h3>g_proxy_address_new ()</h3>
 <pre class="programlisting"><a class="link" href="GSocketAddress.html" title="GSocketAddress"><span class="returnvalue">GSocketAddress</span></a> *    g_proxy_address_new                 (<em class="parameter"><code><a class="link" href="GInetAddress.html" title="GInetAddress"><span class="type">GInetAddress</span></a> *inetaddr</code></em>,
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> port</code></em>,
@@ -258,43 +248,39 @@ tunnel through <em class="parameter"><code>dest_hostname</code></em> and <em cla
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>inetaddr</code></em> :</span></p></td>
-<td>The proxy server <a class="link" href="GInetAddress.html" title="GInetAddress"><span class="type">GInetAddress</span></a>.
-</td>
+<td>The proxy server <a class="link" href="GInetAddress.html" title="GInetAddress"><span class="type">GInetAddress</span></a>.</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>port</code></em> :</span></p></td>
-<td>The proxy server port.
-</td>
+<td>The proxy server port.</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>protocol</code></em> :</span></p></td>
-<td>The proxy protocol to support, in lower case (e.g. socks, http).
-</td>
+<td>The proxy protocol to support, in lower case (e.g. socks, http).</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>dest_hostname</code></em> :</span></p></td>
-<td>The destination hostname the the proxy should tunnel to.
-</td>
+<td>The destination hostname the the proxy should tunnel to.</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>dest_port</code></em> :</span></p></td>
-<td>The destination port to tunnel to.
-</td>
+<td>The destination port to tunnel to.</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>username</code></em> :</span></p></td>
-<td>The username to authenticate to the proxy server (or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>).
+<td>The username to authenticate to the proxy server
+(or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>). <span class="annotation">[<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>password</code></em> :</span></p></td>
-<td>The password to authenticate to the proxy server (or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>).
+<td>The password to authenticate to the proxy server
+(or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>). <span class="annotation">[<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> a new <a class="link" href="GProxyAddress.html" title="GProxyAddress"><span class="type">GProxyAddress</span></a>
+<td>a new <a class="link" href="GProxyAddress.html" title="GProxyAddress"><span class="type">GProxyAddress</span></a>
 </td>
 </tr>
 </tbody>
@@ -302,16 +288,16 @@ tunnel through <em class="parameter"><code>dest_hostname</code></em> and <em cla
 <p class="since">Since 2.26</p>
 </div>
 </div>
-<div class="refsect1" title="Property Details">
+<div class="refsect1">
 <a name="GProxyAddress.property-details"></a><h2>Property Details</h2>
-<div class="refsect2" title='The "destination-hostname" property'>
+<div class="refsect2">
 <a name="GProxyAddress--destination-hostname"></a><h3>The <code class="literal">"destination-hostname"</code> property</h3>
 <pre class="programlisting">  "destination-hostname"     <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write / Construct Only</pre>
 <p>The proxy destination hostname.</p>
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "destination-port" property'>
+<div class="refsect2">
 <a name="GProxyAddress--destination-port"></a><h3>The <code class="literal">"destination-port"</code> property</h3>
 <pre class="programlisting">  "destination-port"         <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a>                 : Read / Write / Construct Only</pre>
 <p>The proxy destination port.</p>
@@ -319,21 +305,21 @@ tunnel through <em class="parameter"><code>dest_hostname</code></em> and <em cla
 <p>Default value: 0</p>
 </div>
 <hr>
-<div class="refsect2" title='The "password" property'>
+<div class="refsect2">
 <a name="GProxyAddress--password"></a><h3>The <code class="literal">"password"</code> property</h3>
 <pre class="programlisting">  "password"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write / Construct Only</pre>
 <p>The proxy password.</p>
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "protocol" property'>
+<div class="refsect2">
 <a name="GProxyAddress--protocol"></a><h3>The <code class="literal">"protocol"</code> property</h3>
 <pre class="programlisting">  "protocol"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write / Construct Only</pre>
 <p>The proxy protocol.</p>
 <p>Default value: NULL</p>
 </div>
 <hr>
-<div class="refsect2" title='The "username" property'>
+<div class="refsect2">
 <a name="GProxyAddress--username"></a><h3>The <code class="literal">"username"</code> property</h3>
 <pre class="programlisting">  "username"                 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>*                : Read / Write / Construct Only</pre>
 <p>The proxy username.</p>
@@ -343,6 +329,6 @@ tunnel through <em class="parameter"><code>dest_hostname</code></em> and <em cla
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.16.1</div>
 </body>
 </html>

data/vendor/local/share/gtk-doc/html/gio/GProxyResolver.html CHANGED

@@ -8,7 +8,7 @@
 <link rel="up" href="resolver.html" title="DNS resolution">
 <link rel="prev" href="GResolver.html" title="GResolver">
 <link rel="next" href="GSocketConnectable.html" title="GSocketConnectable">
-<meta name="generator" content="GTK-Doc V1.15 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.16.1 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -30,7 +30,7 @@
                   <a href="#GProxyResolver.prerequisites" class="shortcut">Prerequisites</a>
 </td></tr>
 </table>
-<div class="refentry" title="GProxyResolver">
+<div class="refentry">
 <a name="GProxyResolver"></a><div class="titlepage"></div>
 <div class="refnamediv"><table width="100%"><tr>
 <td valign="top">
@@ -39,12 +39,13 @@
 </td>
 <td valign="top" align="right"></td>
 </tr></table></div>
-<div class="refsynopsisdiv" title="Synopsis">
+<div class="refsynopsisdiv">
 <a name="GProxyResolver.synopsis"></a><h2>Synopsis</h2>
 <pre class="synopsis">
 #include &lt;gio/gio.h&gt;
                     <a class="link" href="GProxyResolver.html#GProxyResolver-struct" title="GProxyResolver">GProxyResolver</a>;
+struct              <a class="link" href="GProxyResolver.html#GProxyResolverInterface" title="struct GProxyResolverInterface">GProxyResolverInterface</a>;
 #define             <a class="link" href="GProxyResolver.html#G-PROXY-RESOLVER-EXTENSION-POINT-NAME:CAPS" title="G_PROXY_RESOLVER_EXTENSION_POINT_NAME">G_PROXY_RESOLVER_EXTENSION_POINT_NAME</a>
 <a class="link" href="GProxyResolver.html" title="GProxyResolver"><span class="returnvalue">GProxyResolver</span></a> *    <a class="link" href="GProxyResolver.html#g-proxy-resolver-get-default" title="g_proxy_resolver_get_default ()">g_proxy_resolver_get_default</a>        (<em class="parameter"><code><span class="type">void</span></code></em>);
 <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            <a class="link" href="GProxyResolver.html#g-proxy-resolver-is-supported" title="g_proxy_resolver_is_supported ()">g_proxy_resolver_is_supported</a>       (<em class="parameter"><code><a class="link" href="GProxyResolver.html" title="GProxyResolver"><span class="type">GProxyResolver</span></a> *resolver</code></em>);
@@ -62,20 +63,20 @@
                                                          <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);
 </pre>
 </div>
-<div class="refsect1" title="Object Hierarchy">
+<div class="refsect1">
 <a name="GProxyResolver.object-hierarchy"></a><h2>Object Hierarchy</h2>
 <pre class="synopsis">
   GInterface
    +----GProxyResolver
 </pre>
 </div>
-<div class="refsect1" title="Prerequisites">
+<div class="refsect1">
 <a name="GProxyResolver.prerequisites"></a><h2>Prerequisites</h2>
 <p>
 GProxyResolver requires
  <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a>.</p>
 </div>
-<div class="refsect1" title="Description">
+<div class="refsect1">
 <a name="GProxyResolver.description"></a><h2>Description</h2>
 <p>
 <a class="link" href="GProxyResolver.html" title="GProxyResolver"><span class="type">GProxyResolver</span></a> provides synchronous and asynchronous network proxy
@@ -83,9 +84,9 @@ resolution. <a class="link" href="GProxyResolver.html" title="GProxyResolver"><s
 the method <a class="link" href="GSocketConnectable.html#g-socket-connectable-proxy-enumerate" title="g_socket_connectable_proxy_enumerate ()"><code class="function">g_socket_connectable_proxy_enumerate()</code></a>.
 </p>
 </div>
-<div class="refsect1" title="Details">
+<div class="refsect1">
 <a name="GProxyResolver.details"></a><h2>Details</h2>
-<div class="refsect2" title="GProxyResolver">
+<div class="refsect2">
 <a name="GProxyResolver-struct"></a><h3>GProxyResolver</h3>
 <pre class="programlisting">typedef struct _GProxyResolver GProxyResolver;</pre>
 <p>
@@ -94,7 +95,35 @@ Interface that can be used to resolve proxy address.
 <p class="since">Since 2.26</p>
 </div>
 <hr>
-<div class="refsect2" title="G_PROXY_RESOLVER_EXTENSION_POINT_NAME">
+<div class="refsect2">
+<a name="GProxyResolverInterface"></a><h3>struct GProxyResolverInterface</h3>
+<pre class="programlisting">struct GProxyResolverInterface {
+  GTypeInterface g_iface;
+  /* Virtual Table */
+  gboolean (* is_supported)  (GProxyResolver       *resolver);
+  gchar ** (* lookup)        (GProxyResolver       *resolver,
+			      const gchar          *uri,
+			      GCancellable         *cancellable,
+			      GError              **error);
+  void     (* lookup_async)  (GProxyResolver       *resolver,
+			      const gchar          *uri,
+			      GCancellable         *cancellable,
+			      GAsyncReadyCallback   callback,
+			      gpointer              user_data);
+  gchar ** (* lookup_finish) (GProxyResolver       *resolver,
+			      GAsyncResult         *result,
+			      GError              **error);
+};
+</pre>
+<p>
+</p>
+</div>
+<hr>
+<div class="refsect2">
 <a name="G-PROXY-RESOLVER-EXTENSION-POINT-NAME:CAPS"></a><h3>G_PROXY_RESOLVER_EXTENSION_POINT_NAME</h3>
 <pre class="programlisting">#define G_PROXY_RESOLVER_EXTENSION_POINT_NAME "gio-proxy-resolver"
 </pre>
@@ -104,7 +133,7 @@ See Extending GIO.
 </p>
 </div>
 <hr>
-<div class="refsect2" title="g_proxy_resolver_get_default ()">
+<div class="refsect2">
 <a name="g-proxy-resolver-get-default"></a><h3>g_proxy_resolver_get_default ()</h3>
 <pre class="programlisting"><a class="link" href="GProxyResolver.html" title="GProxyResolver"><span class="returnvalue">GProxyResolver</span></a> *    g_proxy_resolver_get_default        (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
@@ -114,15 +143,14 @@ Gets the default <a class="link" href="GProxyResolver.html" title="GProxyResolve
 <col align="left" valign="top">
 <tbody><tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> the default <a class="link" href="GProxyResolver.html" title="GProxyResolver"><span class="type">GProxyResolver</span></a>.
+<td>the default <a class="link" href="GProxyResolver.html" title="GProxyResolver"><span class="type">GProxyResolver</span></a>. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span>
 </td>
 </tr></tbody>
 </table></div>
 <p class="since">Since 2.26</p>
 </div>
 <hr>
-<div class="refsect2" title="g_proxy_resolver_is_supported ()">
+<div class="refsect2">
 <a name="g-proxy-resolver-is-supported"></a><h3>g_proxy_resolver_is_supported ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>            g_proxy_resolver_is_supported       (<em class="parameter"><code><a class="link" href="GProxyResolver.html" title="GProxyResolver"><span class="type">GProxyResolver</span></a> *resolver</code></em>);</pre>
 <p>
@@ -140,16 +168,15 @@ resolver that returns <a href="http://library.gnome.org/devel/glib/unstable/glib
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if <em class="parameter"><code>resolver</code></em> is supported.
-</td>
+<td>
+<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if <em class="parameter"><code>resolver</code></em> is supported.</td>
 </tr>
 </tbody>
 </table></div>
 <p class="since">Since 2.26</p>
 </div>
 <hr>
-<div class="refsect2" title="g_proxy_resolver_lookup ()">
+<div class="refsect2">
 <a name="g-proxy-resolver-lookup"></a><h3>g_proxy_resolver_lookup ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> **            g_proxy_resolver_lookup             (<em class="parameter"><code><a class="link" href="GProxyResolver.html" title="GProxyResolver"><span class="type">GProxyResolver</span></a> *resolver</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *uri</code></em>,
@@ -184,12 +211,11 @@ returned array of proxies.
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>uri</code></em> :</span></p></td>
-<td>a URI representing the destination to connect to
-</td>
+<td>a URI representing the destination to connect to</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>cancellable</code></em> :</span></p></td>
-<td>a <a class="link" href="GCancellable.html" title="GCancellable"><span class="type">GCancellable</span></a>, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
+<td>a <a class="link" href="GCancellable.html" title="GCancellable"><span class="type">GCancellable</span></a>, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. <span class="annotation">[<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span>
 </td>
 </tr>
 <tr>
@@ -199,9 +225,9 @@ returned array of proxies.
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> A NULL-terminated array of proxy URIs. Must be freed with
-              <a href="http://library.gnome.org/devel/glib/unstable/glib-String-Utility-Functions.html#g-strfreev"><code class="function">g_strfreev()</code></a>.
+<td>A
+NULL-terminated array of proxy URIs. Must be freed
+with <a href="http://library.gnome.org/devel/glib/unstable/glib-String-Utility-Functions.html#g-strfreev"><code class="function">g_strfreev()</code></a>. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>][<acronym title="Parameter points to an array of items."><span class="acronym">array</span></acronym> zero-terminated=1]</span>
 </td>
 </tr>
 </tbody>
@@ -209,7 +235,7 @@ returned array of proxies.
 <p class="since">Since 2.26</p>
 </div>
 <hr>
-<div class="refsect2" title="g_proxy_resolver_lookup_async ()">
+<div class="refsect2">
 <a name="g-proxy-resolver-lookup-async"></a><h3>g_proxy_resolver_lookup_async ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                g_proxy_resolver_lookup_async       (<em class="parameter"><code><a class="link" href="GProxyResolver.html" title="GProxyResolver"><span class="type">GProxyResolver</span></a> *resolver</code></em>,
                                                          <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *uri</code></em>,
@@ -230,22 +256,21 @@ details.
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>uri</code></em> :</span></p></td>
-<td>a URI representing the destination to connect to
-</td>
+<td>a URI representing the destination to connect to</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>cancellable</code></em> :</span></p></td>
-<td>a <a class="link" href="GCancellable.html" title="GCancellable"><span class="type">GCancellable</span></a>, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>
+<td>a <a class="link" href="GCancellable.html" title="GCancellable"><span class="type">GCancellable</span></a>, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. <span class="annotation">[<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>callback</code></em> :</span></p></td>
-<td>callback to call after resolution completes
+<td>callback to call after resolution completes. <span class="annotation">[<acronym title="The callback is valid until first called."><span class="acronym">scope async</span></acronym>]</span>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
-<td>data for <em class="parameter"><code>callback</code></em>
+<td>data for <em class="parameter"><code>callback</code></em>. <span class="annotation">[<acronym title="This parameter is a 'user_data', for callbacks; many bindings can pass NULL here."><span class="acronym">closure</span></acronym>]</span>
 </td>
 </tr>
 </tbody>
@@ -253,7 +278,7 @@ details.
 <p class="since">Since 2.26</p>
 </div>
 <hr>
-<div class="refsect2" title="g_proxy_resolver_lookup_finish ()">
+<div class="refsect2">
 <a name="g-proxy-resolver-lookup-finish"></a><h3>g_proxy_resolver_lookup_finish ()</h3>
 <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> **            g_proxy_resolver_lookup_finish      (<em class="parameter"><code><a class="link" href="GProxyResolver.html" title="GProxyResolver"><span class="type">GProxyResolver</span></a> *resolver</code></em>,
                                                          <em class="parameter"><code><a class="link" href="GAsyncResult.html" title="GAsyncResult"><span class="type">GAsyncResult</span></a> *result</code></em>,
@@ -283,9 +308,9 @@ Call this function to obtain the array of proxy URIs when
 </tr>
 <tr>
 <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
-<td> A NULL-terminated array of proxy URIs. Must be freed with
-              <a href="http://library.gnome.org/devel/glib/unstable/glib-String-Utility-Functions.html#g-strfreev"><code class="function">g_strfreev()</code></a>.
+<td>A
+NULL-terminated array of proxy URIs. Must be freed
+with <a href="http://library.gnome.org/devel/glib/unstable/glib-String-Utility-Functions.html#g-strfreev"><code class="function">g_strfreev()</code></a>. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>][<acronym title="Parameter points to an array of items."><span class="acronym">array</span></acronym> zero-terminated=1]</span>
 </td>
 </tr>
 </tbody>
@@ -296,6 +321,6 @@ Call this function to obtain the array of proxy URIs when
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.15</div>
+          Generated by GTK-Doc V1.16.1</div>
 </body>
 </html>