projects
/
platform
/
upstream
/
glib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[kdbus] Add new library API for common tasks on dbus/kdbus
[platform/upstream/glib.git]
/
gio
/
gproxyaddress.h
diff --git
a/gio/gproxyaddress.h
b/gio/gproxyaddress.h
index
cc4594d
..
11942de
100644
(file)
--- a/
gio/gproxyaddress.h
+++ b/
gio/gproxyaddress.h
@@
-13,20
+13,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/>.
*
* Authors: Nicolas Dufresne <nicolas.dufresne@collabora.co.uk>
*/
*
* Authors: Nicolas Dufresne <nicolas.dufresne@collabora.co.uk>
*/
+#ifndef __G_PROXY_ADDRESS_H__
+#define __G_PROXY_ADDRESS_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_ADDRESS_H__
-#define __G_PROXY_ADDRESS_H__
-
#include <gio/ginetsocketaddress.h>
G_BEGIN_DECLS
#include <gio/ginetsocketaddress.h>
G_BEGIN_DECLS
@@
-55,8
+53,10
@@
struct _GProxyAddressClass
};
};
+GLIB_AVAILABLE_IN_ALL
GType g_proxy_address_get_type (void) G_GNUC_CONST;
GType g_proxy_address_get_type (void) G_GNUC_CONST;
+GLIB_AVAILABLE_IN_ALL
GSocketAddress *g_proxy_address_new (GInetAddress *inetaddr,
guint16 port,
const gchar *protocol,
GSocketAddress *g_proxy_address_new (GInetAddress *inetaddr,
guint16 port,
const gchar *protocol,
@@
-65,12
+65,22
@@
GSocketAddress *g_proxy_address_new (GInetAddress *inetaddr,
const gchar *username,
const gchar *password);
const gchar *username,
const gchar *password);
+GLIB_AVAILABLE_IN_ALL
const gchar *g_proxy_address_get_protocol (GProxyAddress *proxy);
const gchar *g_proxy_address_get_protocol (GProxyAddress *proxy);
+GLIB_AVAILABLE_IN_2_34
+const gchar *g_proxy_address_get_destination_protocol (GProxyAddress *proxy);
+GLIB_AVAILABLE_IN_ALL
const gchar *g_proxy_address_get_destination_hostname (GProxyAddress *proxy);
const gchar *g_proxy_address_get_destination_hostname (GProxyAddress *proxy);
+GLIB_AVAILABLE_IN_ALL
guint16 g_proxy_address_get_destination_port (GProxyAddress *proxy);
guint16 g_proxy_address_get_destination_port (GProxyAddress *proxy);
+GLIB_AVAILABLE_IN_ALL
const gchar *g_proxy_address_get_username (GProxyAddress *proxy);
const gchar *g_proxy_address_get_username (GProxyAddress *proxy);
+GLIB_AVAILABLE_IN_ALL
const gchar *g_proxy_address_get_password (GProxyAddress *proxy);
const gchar *g_proxy_address_get_password (GProxyAddress *proxy);
+GLIB_AVAILABLE_IN_2_34
+const gchar *g_proxy_address_get_uri (GProxyAddress *proxy);
+
G_END_DECLS
#endif /* __G_PROXY_ADDRESS_H__ */
G_END_DECLS
#endif /* __G_PROXY_ADDRESS_H__ */