projects
/
platform
/
upstream
/
glib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gresource: Make extract work better
[platform/upstream/glib.git]
/
gio
/
gproxy.c
diff --git
a/gio/gproxy.c
b/gio/gproxy.c
index
475759f
..
bf5b1e2
100644
(file)
--- a/
gio/gproxy.c
+++ b/
gio/gproxy.c
@@
-13,9
+13,7
@@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
*
* Author: Nicolas Dufresne <nicolas.dufresne@collabora.co.uk>
*/
*
* Author: Nicolas Dufresne <nicolas.dufresne@collabora.co.uk>
*/
@@
-31,6
+29,7
@@
/**
* SECTION:gproxy
* @short_description: Interface for proxy handling
/**
* SECTION:gproxy
* @short_description: Interface for proxy handling
+ * @include: gio/gio.h
*
* A #GProxy handles connecting to a remote host via a given type of
* proxy server. It is implemented by the 'gio-proxy' extension point.
*
* A #GProxy handles connecting to a remote host via a given type of
* proxy server. It is implemented by the 'gio-proxy' extension point.
@@
-56,7
+55,7
@@
g_proxy_default_init (GProxyInterface *iface)
* Lookup "gio-proxy" extension point for a proxy implementation that supports
* specified protocol.
*
* Lookup "gio-proxy" extension point for a proxy implementation that supports
* specified protocol.
*
- * Return
value
: (transfer full): return a #GProxy or NULL if protocol
+ * Return
s
: (transfer full): return a #GProxy or NULL if protocol
* is not supported.
*
* Since: 2.26
* is not supported.
*
* Since: 2.26
@@
-93,7
+92,7
@@
g_proxy_get_default_for_protocol (const gchar *protocol)
* does the necessary handshake to connect to @proxy_address, and if
* required, wraps the #GIOStream to handle proxy payload.
*
* does the necessary handshake to connect to @proxy_address, and if
* required, wraps the #GIOStream to handle proxy payload.
*
- * Return
value
: (transfer full): a #GIOStream that will replace @connection. This might
+ * Return
s
: (transfer full): a #GIOStream that will replace @connection. This might
* be the same as @connection, in which case a reference
* will be added.
*
* be the same as @connection, in which case a reference
* will be added.
*
@@
-162,7
+161,7
@@
g_proxy_connect_async (GProxy *proxy,
*
* See g_proxy_connect().
*
*
* See g_proxy_connect().
*
- * Return
value
: (transfer full): a #GIOStream.
+ * Return
s
: (transfer full): a #GIOStream.
*
* Since: 2.26
*/
*
* Since: 2.26
*/
@@
-192,7
+191,7
@@
g_proxy_connect_finish (GProxy *proxy,
* #GProxyAddress containing the stringified IP address to
* g_proxy_connect() or g_proxy_connect_async().
*
* #GProxyAddress containing the stringified IP address to
* g_proxy_connect() or g_proxy_connect_async().
*
- * Return
value
: %TRUE if hostname resolution is supported.
+ * Return
s
: %TRUE if hostname resolution is supported.
*
* Since: 2.26
*/
*
* Since: 2.26
*/