projects
/
platform
/
upstream
/
glib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
GSettings: fix check for delaying backend subscription
[platform/upstream/glib.git]
/
gio
/
gproxy.h
diff --git
a/gio/gproxy.h
b/gio/gproxy.h
index
626e0ee
..
9a169c9
100644
(file)
--- a/
gio/gproxy.h
+++ b/
gio/gproxy.h
@@
-15,20
+15,18
@@
* 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>
*/
+#ifndef __G_PROXY_H__
+#define __G_PROXY_H__
+
#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
#error "Only <gio/gio.h> can be included directly."
#endif
#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
#error "Only <gio/gio.h> can be included directly."
#endif
-#ifndef __G_PROXY_H__
-#define __G_PROXY_H__
-
#include <gio/giotypes.h>
G_BEGIN_DECLS
#include <gio/giotypes.h>
G_BEGIN_DECLS
@@
-42,7
+40,7
@@
G_BEGIN_DECLS
* G_PROXY_EXTENSION_POINT_NAME:
*
* Extension point for proxy functionality.
* G_PROXY_EXTENSION_POINT_NAME:
*
* Extension point for proxy functionality.
- * See
<link linkend="extending-gio">Extending GIO</link>
.
+ * See
[Extending GIO][extending-gio]
.
*
* Since: 2.26
*/
*
* Since: 2.26
*/
@@
-62,8
+60,9
@@
typedef struct _GProxyInterface GProxyInterface;
* @g_iface: The parent interface.
* @connect: Connect to proxy server and wrap (if required) the #connection
* to handle payload.
* @g_iface: The parent interface.
* @connect: Connect to proxy server and wrap (if required) the #connection
* to handle payload.
- * @connect_async: Same
h
as connect() but asynchronous.
+ * @connect_async: Same as connect() but asynchronous.
* @connect_finish: Returns the result of connect_async()
* @connect_finish: Returns the result of connect_async()
+ * @supports_hostname: Returns whether the proxy supports hostname lookups.
*
* Provides an interface for handling proxy connection and payload.
*
*
* Provides an interface for handling proxy connection and payload.
*
@@
-95,16
+94,20
@@
struct _GProxyInterface
gboolean (* supports_hostname) (GProxy *proxy);
};
gboolean (* supports_hostname) (GProxy *proxy);
};
+GLIB_AVAILABLE_IN_ALL
GType g_proxy_get_type (void) G_GNUC_CONST;
GType g_proxy_get_type (void) G_GNUC_CONST;
+GLIB_AVAILABLE_IN_ALL
GProxy *g_proxy_get_default_for_protocol (const gchar *protocol);
GProxy *g_proxy_get_default_for_protocol (const gchar *protocol);
+GLIB_AVAILABLE_IN_ALL
GIOStream *g_proxy_connect (GProxy *proxy,
GIOStream *connection,
GProxyAddress *proxy_address,
GCancellable *cancellable,
GError **error);
GIOStream *g_proxy_connect (GProxy *proxy,
GIOStream *connection,
GProxyAddress *proxy_address,
GCancellable *cancellable,
GError **error);
+GLIB_AVAILABLE_IN_ALL
void g_proxy_connect_async (GProxy *proxy,
GIOStream *connection,
GProxyAddress *proxy_address,
void g_proxy_connect_async (GProxy *proxy,
GIOStream *connection,
GProxyAddress *proxy_address,
@@
-112,10
+115,12
@@
void g_proxy_connect_async (GProxy *proxy,
GAsyncReadyCallback callback,
gpointer user_data);
GAsyncReadyCallback callback,
gpointer user_data);
+GLIB_AVAILABLE_IN_ALL
GIOStream *g_proxy_connect_finish (GProxy *proxy,
GAsyncResult *result,
GError **error);
GIOStream *g_proxy_connect_finish (GProxy *proxy,
GAsyncResult *result,
GError **error);
+GLIB_AVAILABLE_IN_ALL
gboolean g_proxy_supports_hostname (GProxy *proxy);
G_END_DECLS
gboolean g_proxy_supports_hostname (GProxy *proxy);
G_END_DECLS