--- a/libpurple/proxy.h Thu Mar 31 22:53:18 2022 -0500
+++ b/libpurple/proxy.h Fri Apr 01 01:09:23 2022 -0500
@@ -30,166 +30,12 @@
#include <gio/gio.h>
#include "eventloop.h"
-/**
- * PurpleProxyType:
- * @PURPLE_PROXY_USE_GLOBAL: Use the global proxy information.
- * @PURPLE_PROXY_NONE: No proxy.
- * @PURPLE_PROXY_HTTP: HTTP proxy.
- * @PURPLE_PROXY_SOCKS4: SOCKS 4 proxy.
- * @PURPLE_PROXY_SOCKS5: SOCKS 5 proxy.
- * @PURPLE_PROXY_USE_ENVVAR: Use environmental settings.
- * @PURPLE_PROXY_TOR: Use a Tor proxy (SOCKS 5 really).
- *
- * A type of proxy connection.
- */
-typedef enum
-{
- PURPLE_PROXY_USE_GLOBAL = -1,
- PURPLE_PROXY_NONE = 0,
- PURPLE_PROXY_HTTP,
- PURPLE_PROXY_SOCKS4,
- PURPLE_PROXY_SOCKS5,
- PURPLE_PROXY_USE_ENVVAR,
- PURPLE_PROXY_TOR
-
-} PurpleProxyType;
-
-/**
- * PurpleProxyInfo:
- *
- * Information on proxy settings.
- */
-typedef struct _PurpleProxyInfo PurpleProxyInfo;
-
-
#include "account.h"
+#include "purpleproxyinfo.h"
G_BEGIN_DECLS
/**************************************************************************/
-/* Proxy structure API */
-/**************************************************************************/
-
-/**
- * purple_proxy_info_get_type:
- *
- * Returns: The #GType for proxy information.
- */
-GType purple_proxy_info_get_type(void);
-
-/**
- * purple_proxy_info_new:
- *
- * Creates a proxy information structure.
- *
- * Returns: The proxy information structure.
- */
-PurpleProxyInfo *purple_proxy_info_new(void);
-
-/**
- * purple_proxy_info_destroy:
- * @info: The proxy information structure to destroy.
- *
- * Destroys a proxy information structure.
- */
-void purple_proxy_info_destroy(PurpleProxyInfo *info);
-
-/**
- * purple_proxy_info_set_proxy_type:
- * @info: The proxy information.
- * @type: The proxy type.
- *
- * Sets the type of proxy.
- */
-void purple_proxy_info_set_proxy_type(PurpleProxyInfo *info, PurpleProxyType type);
-
-/**
- * purple_proxy_info_set_host:
- * @info: The proxy information.
- * @host: The host.
- *
- * Sets the proxy host.
- */
-void purple_proxy_info_set_host(PurpleProxyInfo *info, const char *host);
-
-/**
- * purple_proxy_info_set_port:
- * @info: The proxy information.
- * @port: The port.
- *
- * Sets the proxy port.
- */
-void purple_proxy_info_set_port(PurpleProxyInfo *info, int port);
-
-/**
- * purple_proxy_info_set_username:
- * @info: The proxy information.
- * @username: The username.
- *
- * Sets the proxy username.
- */
-void purple_proxy_info_set_username(PurpleProxyInfo *info, const char *username);
-
-/**
- * purple_proxy_info_set_password:
- * @info: The proxy information.
- * @password: The password.
- *
- * Sets the proxy password.
- */
-void purple_proxy_info_set_password(PurpleProxyInfo *info, const char *password);
-
-/**
- * purple_proxy_info_get_proxy_type:
- * @info: The proxy information.
- *
- * Returns the proxy's type.
- *
- * Returns: The type.
- */
-PurpleProxyType purple_proxy_info_get_proxy_type(const PurpleProxyInfo *info);
-
-/**
- * purple_proxy_info_get_host:
- * @info: The proxy information.
- *
- * Returns the proxy's host.
- *
- * Returns: The host.
- */
-const char *purple_proxy_info_get_host(const PurpleProxyInfo *info);
-
-/**
- * purple_proxy_info_get_port:
- * @info: The proxy information.
- *
- * Returns the proxy's port.
- *
- * Returns: The port.
- */
-int purple_proxy_info_get_port(const PurpleProxyInfo *info);
-
-/**
- * purple_proxy_info_get_username:
- * @info: The proxy information.
- *
- * Returns the proxy's username.
- *
- * Returns: The username.
- */
-const char *purple_proxy_info_get_username(const PurpleProxyInfo *info);
-
-/**
- * purple_proxy_info_get_password:
- * @info: The proxy information.
- *
- * Returns the proxy's password.
- *
- * Returns: The password.
- */
-const char *purple_proxy_info_get_password(const PurpleProxyInfo *info);
-
-/**************************************************************************/
/* Global Proxy API */
/**************************************************************************/
