X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gio%2Fgsimpleproxyresolver.c;h=8610e2b4eea6ee7d38c11092d1e61bed41715924;hb=51fac05d73f8363de821eb0d6940dedca13a8c0f;hp=fcfce6d344ca772eb1b13295dc2a3e67dd530d74;hpb=e38ee2f468bbbed0d354a95bbace3e9e19e8e695;p=platform%2Fupstream%2Fglib.git
diff --git a/gio/gsimpleproxyresolver.c b/gio/gsimpleproxyresolver.c
index fcfce6d..8610e2b 100644
--- a/gio/gsimpleproxyresolver.c
+++ b/gio/gsimpleproxyresolver.c
@@ -414,10 +414,8 @@ g_simple_proxy_resolver_class_init (GSimpleProxyResolverClass *resolver_class)
* of the schemes set with g_simple_proxy_resolver_set_uri_proxy().
*
* Note that as a special case, if this URI starts with
- * "socks://", #GSimpleProxyResolver will treat
- * it as referring to all three of the socks5,
- * socks4a, and socks4 proxy
- * types.
+ * "socks://", #GSimpleProxyResolver will treat it as referring
+ * to all three of the socks5, socks4a, and socks4 proxy types.
*/
g_object_class_install_property (object_class, PROP_DEFAULT_PROXY,
g_param_spec_string ("default-proxy",
@@ -435,32 +433,21 @@ g_simple_proxy_resolver_class_init (GSimpleProxyResolverClass *resolver_class)
*
* Entries can be in one of 4 formats:
*
- *
- *
- * A hostname, such as "example.com",
- * ".example.com", or
- * "*.example.com", any of which match
- * "example.com" or any subdomain of it.
- *
- *
- * An IPv4 or IPv6 address, such as
- * "192.168.1.1", which matches only
- * that address.
- *
- *
- * A hostname or IP address followed by a port, such as
- * "example.com:80", which matches whatever
- * the hostname or IP address would match, but only for URLs
- * with the (explicitly) indicated port. In the case of an IPv6
- * address, the address part must appear in brackets:
- * "[::1]:443"
- *
- *
- * An IP address range, given by a base address and prefix length,
- * such as "fe80::/10", which matches any
- * address in that range.
- *
- *
+ * - A hostname, such as "example.com", ".example.com", or
+ * "*.example.com", any of which match "example.com" or
+ * any subdomain of it.
+ *
+ * - An IPv4 or IPv6 address, such as "192.168.1.1",
+ * which matches only that address.
+ *
+ * - A hostname or IP address followed by a port, such as
+ * "example.com:80", which matches whatever the hostname or IP
+ * address would match, but only for URLs with the (explicitly)
+ * indicated port. In the case of an IPv6 address, the address
+ * part must appear in brackets: "[::1]:443"
+ *
+ * - An IP address range, given by a base address and prefix length,
+ * such as "fe80::/10", which matches any address in that range.
*
* Note that when dealing with Unicode hostnames, the matching is
* done against the ASCII form of the name.
@@ -468,13 +455,10 @@ g_simple_proxy_resolver_class_init (GSimpleProxyResolverClass *resolver_class)
* Also note that hostname exclusions apply only to connections made
* to hosts identified by name, and IP address exclusions apply only
* to connections made to hosts identified by address. That is, if
- * example.com has an address of
- * 192.168.1.1, and the :ignore-hosts list
- * contains only "192.168.1.1", then a connection
- * to "example.com" (eg, via a #GNetworkAddress)
- * will use the proxy, and a connection to
- * "192.168.1.1" (eg, via a #GInetSocketAddress)
- * will not.
+ * example.com has an address of 192.168.1.1, and the :ignore-hosts list
+ * contains only "192.168.1.1", then a connection to "example.com"
+ * (eg, via a #GNetworkAddress) will use the proxy, and a connection to
+ * "192.168.1.1" (eg, via a #GInetSocketAddress) will not.
*
* These rules match the "ignore-hosts"/"noproxy" rules most
* commonly used by other applications.
@@ -500,16 +484,16 @@ g_simple_proxy_resolver_iface_init (GProxyResolverInterface *iface)
/**
* g_simple_proxy_resolver_new:
* @default_proxy: (allow-none): the default proxy to use, eg
- * "socks://192.168.1.1"
+ * "socks://192.168.1.1"
* @ignore_hosts: (allow-none): an optional list of hosts/IP addresses
- * to not use a proxy for.
+ * to not use a proxy for.
*
* Creates a new #GSimpleProxyResolver. See
* #GSimpleProxyResolver:default-proxy and
* #GSimpleProxyResolver:ignore-hosts for more details on how the
* arguments are interpreted.
*
- * Returns: a new #GSimpleProxyResolver
+ * Returns: (transfer full) a new #GSimpleProxyResolver
*
* Since: 2.36
*/
@@ -532,16 +516,15 @@ g_simple_proxy_resolver_new (const gchar *default_proxy,
* don't match #GSimpleProxyResolver:ignore-hosts or a proxy set
* via g_simple_proxy_resolver_set_uri_proxy().
*
- * If @default_proxy starts with "socks://",
+ * If @default_proxy starts with "socks://",
* #GSimpleProxyResolver will treat it as referring to all three of
- * the socks5, socks4a, and
- * socks4 proxy types.
+ * the socks5, socks4a, and socks4 proxy types.
*
* Since: 2.36
*/
void
-g_simple_proxy_resolver_set_default_proxy (GSimpleProxyResolver *resolver,
- const gchar *default_proxy)
+g_simple_proxy_resolver_set_default_proxy (GSimpleProxyResolver *resolver,
+ const gchar *default_proxy)
{
g_return_if_fail (G_IS_SIMPLE_PROXY_RESOLVER (resolver));
@@ -586,9 +569,8 @@ g_simple_proxy_resolver_set_ignore_hosts (GSimpleProxyResolver *resolver,
* #GSimpleProxyResolver:ignore-hosts) will be proxied via @proxy.
*
* As with #GSimpleProxyResolver:default-proxy, if @proxy starts with
- * "socks://", #GSimpleProxyResolver will treat it
- * as referring to all three of the socks5,
- * socks4a, and socks4 proxy
+ * "socks://", #GSimpleProxyResolver will treat it
+ * as referring to all three of the socks5, socks4a, and socks4 proxy
* types.
*
* Since: 2.36