Patch from Samuel Cormier-Iijima <sciyoshi@gmail.com>:

[cascardo/gnio.git] / gnio / ginetaddress.h

diff --git a/gnio/ginetaddress.h b/gnio/ginetaddress.h
index 815df40..eec559e 100644 (file)
--- a/gnio/ginetaddress.h
+++ b/gnio/ginetaddress.h
@@ -2,8 +2,7 @@
 #define G_INET_ADDRESS_H
 
 #include <glib-object.h>
-#include <gio/gcancellable.h>
-#include <gio/gasyncresult.h>
+#include <gio/gio.h>
 
 G_BEGIN_DECLS
 
@@ -14,63 +13,52 @@ G_BEGIN_DECLS
 #define G_IS_INET_ADDRESS_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_INET_ADDRESS))
 #define G_INET_ADDRESS_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_INET_ADDRESS, GInetAddressClass))
 
-typedef struct GInetAddress        GInetAddress;
-typedef struct GInetAddressClass   GInetAddressClass;
+typedef struct _GInetAddress        GInetAddress;
+typedef struct _GInetAddressClass   GInetAddressClass;
 
-struct GInetAddress {
-    
+struct _GInetAddress
+{
   GObject parent;
-
 };
 
-struct GInetAddressClass {
-    
+struct _GInetAddressClass
+{
   GObjectClass parent_class;
-};
-
-GType          g_inet_address_get_type            (void) G_GNUC_CONST;
-
-
-/* DNS query functions */
-GInetAddress  *g_inet_address_resolve               (const char    *host,
-                                                     GCancellable  *cancellable,
-                                                     GError       **error);
 
-void           g_inet_address_resolve_async         (const char *host,
-                                                     GCancellable *cancellable,
-                                                     GAsyncReadyCallback callback,
-                                                     gpointer user_data);
-
-GInetAddress * g_inet_address_resolve_finish        (GInetAddress *address,
-                                                     GAsyncResult *result,
-                                                     GError **error);
+  gboolean (*is_any) (GInetAddress *address);
+  gboolean (*is_linklocal) (GInetAddress *address);
+  gboolean (*is_loopback) (GInetAddress *address);
+  gboolean (*is_sitelocal) (GInetAddress *address);
+  gboolean (*is_multicast) (GInetAddress *address);
+  gboolean (*is_mc_global) (GInetAddress *address);
+  gboolean (*is_mc_linklocal) (GInetAddress *address);
+  gboolean (*is_mc_nodelocal) (GInetAddress *address);
+  gboolean (*is_mc_orglocal) (GInetAddress *address);
+  gboolean (*is_mc_sitelocal) (GInetAddress *address);
+};
 
-char *        g_inet_address_lookup_reverse         (GInetAddress *address,
-                                                     GCancellable  *cancellable,
-                                                     GError       **error);
+GType          g_inet_address_get_type         (void) G_GNUC_CONST;
 
-void           g_inet_address_lookup_reverse_async  (GInetAddress *address,
-                                                     GCancellable *cancellable,
-                                                     GAsyncReadyCallback callback,
-                                                     gpointer user_data);
+/* accessors to gobject properties that get overridden by subclasses */
+gboolean       g_inet_address_is_any          (GInetAddress *address);
 
-char *         g_inet_address_lookup_reverse_finish (GInetAddress *address,
-                                                     GAsyncResult *result,
-                                                     GError **error);
+gboolean       g_inet_address_is_linklocal    (GInetAddress *address);
 
-/* accessors to gobject properties that get overridden by subclasses */
-gboolean       g_inet_address_is_any_local    (GInetAddress *address);
-gboolean       g_inet_address_is_link_local   (GInetAddress *address);
 gboolean       g_inet_address_is_loopback     (GInetAddress *address);
+
 gboolean       g_inet_address_is_sitelocal    (GInetAddress *address);
+
 gboolean       g_inet_address_is_multicast    (GInetAddress *address);
+
 gboolean       g_inet_address_is_mc_global    (GInetAddress *address);
+
 gboolean       g_inet_address_is_mc_linklocal (GInetAddress *address);
+
 gboolean       g_inet_address_is_mc_nodelocal (GInetAddress *address);
-gboolean       g_inet_address_is_mc_orglocal  (GInetAddress *address);
-gboolean       g_inet_address_is_mc_sitelocal (GInetAddress *address);
 
+gboolean       g_inet_address_is_mc_orglocal  (GInetAddress *address);
 
+gboolean       g_inet_address_is_mc_sitelocal (GInetAddress *address);
 
 G_END_DECLS