Merge remote-tracking branch 'gvdb/master'

[platform/upstream/glib.git] / gio / gnetworkaddress.h

diff --git a/gio/gnetworkaddress.h b/gio/gnetworkaddress.h
index 47dba10..af16321 100644 (file)
--- a/gio/gnetworkaddress.h
+++ b/gio/gnetworkaddress.h
@@ -53,12 +53,20 @@ struct _GNetworkAddressClass
 
 };
 
-GType               g_network_address_get_type       (void) G_GNUC_CONST;
+GType               g_network_address_get_type     (void) G_GNUC_CONST;
+
+GSocketConnectable *g_network_address_new          (const gchar      *hostname,
+                                                   guint16           port);
+GSocketConnectable *g_network_address_parse        (const gchar      *host_and_port,
+                                                   guint16           default_port,
+                                                   GError          **error);
+GSocketConnectable *g_network_address_parse_uri    (const gchar      *uri,
+                                                   guint16           default_port,
+                                                   GError          **error);
+const gchar        *g_network_address_get_hostname (GNetworkAddress  *addr);
+guint16             g_network_address_get_port     (GNetworkAddress  *addr);
+const gchar        *g_network_address_get_scheme   (GNetworkAddress  *addr);
 
-GSocketConnectable *g_network_address_new            (const gchar      *hostname,
-                                                     guint16           port);
-const gchar        *g_network_address_get_hostname   (GNetworkAddress  *addr);
-guint16             g_network_address_get_port       (GNetworkAddress  *addr);
 
 G_END_DECLS