[glib/glib-2-72: 35/39] gsimpleproxyresolver: default_proxy should be consistently nullable




commit 3be74cc6f627dfbd2af2ae24ee91c97a9accd8a8
Author: Michael Catanzaro <mcatanzaro redhat com>
Date:   Mon Jun 13 12:58:46 2022 -0500

    gsimpleproxyresolver: default_proxy should be consistently nullable
    
    Currently it's nullable in g_simple_proxy_resolver_new(), but not in
    g_simple_proxy_resolver_set_default_proxy() nor the property. Fix these.
    
    (cherry-picked from commit 8a1f087a31c9fc0e50cd147d4ce11a4bfff647c0)

 gio/gsimpleproxyresolver.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/gio/gsimpleproxyresolver.c b/gio/gsimpleproxyresolver.c
index f19d567438..6a97ba2c6e 100644
--- a/gio/gsimpleproxyresolver.c
+++ b/gio/gsimpleproxyresolver.c
@@ -415,7 +415,7 @@ g_simple_proxy_resolver_class_init (GSimpleProxyResolverClass *resolver_class)
   object_class->finalize = g_simple_proxy_resolver_finalize;
 
   /**
-   * GSimpleProxyResolver:default-proxy:
+   * GSimpleProxyResolver:default-proxy: (nullable)
    *
    * The default proxy URI that will be used for any URI that doesn't
    * match #GSimpleProxyResolver:ignore-hosts, and doesn't match any
@@ -518,7 +518,7 @@ g_simple_proxy_resolver_new (const gchar  *default_proxy,
 /**
  * g_simple_proxy_resolver_set_default_proxy:
  * @resolver: a #GSimpleProxyResolver
- * @default_proxy: the default proxy to use
+ * @default_proxy: (nullable): the default proxy to use
  *
  * Sets the default proxy on @resolver, to be used for any URIs that
  * don't match #GSimpleProxyResolver:ignore-hosts or a proxy set


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]