[kdbus] Update kdbus interface header (commit: c34e65633b4e)

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

diff --git a/gio/gasyncresult.h b/gio/gasyncresult.h
index 26f867e..a80805f 100644 (file)
--- a/gio/gasyncresult.h
+++ b/gio/gasyncresult.h
@@ -1,5 +1,5 @@
 /* GIO - GLib Input, Output and Streaming Library
- * 
+ *
  * Copyright (C) 2006-2007 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -13,9 +13,7 @@
  * 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: Alexander Larsson <alexl@redhat.com>
  */
@@ -23,7 +21,11 @@
 #ifndef __G_ASYNC_RESULT_H__
 #define __G_ASYNC_RESULT_H__
 
-#include <glib-object.h>
+#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
+#error "Only <gio/gio.h> can be included directly."
+#endif
+
+#include <gio/giotypes.h>
 
 G_BEGIN_DECLS
 
@@ -32,28 +34,52 @@ G_BEGIN_DECLS
 #define G_IS_ASYNC_RESULT(obj)        (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_ASYNC_RESULT))
 #define G_ASYNC_RESULT_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_ASYNC_RESULT, GAsyncResultIface))
 
-typedef struct _GAsyncResult         GAsyncResult; /* Dummy typedef */
+/**
+ * GAsyncResult:
+ *
+ * Holds results information for an asynchronous operation,
+ * usually passed directly to a asynchronous _finish() operation.
+ **/
 typedef struct _GAsyncResultIface    GAsyncResultIface;
 
-typedef void (*GAsyncReadyCallback) (GObject *source_object,
-                                    GAsyncResult *res,
-                                    gpointer user_data);
 
+/**
+ * GAsyncResultIface:
+ * @g_iface: The parent interface.
+ * @get_user_data: Gets the user data passed to the callback.
+ * @get_source_object: Gets the source object that issued the asynchronous operation.
+ * @is_tagged: Checks if a result is tagged with a particular source.
+ *
+ * Interface definition for #GAsyncResult.
+ **/
 struct _GAsyncResultIface
 {
   GTypeInterface g_iface;
 
   /* Virtual Table */
 
-  gpointer   (*get_user_data)      (GAsyncResult                *async_result);
-  GObject *  (*get_source_object)  (GAsyncResult                *async_result);
+  gpointer  (* get_user_data)     (GAsyncResult *res);
+  GObject * (* get_source_object) (GAsyncResult *res);
+
+  gboolean  (* is_tagged)         (GAsyncResult *res,
+                                  gpointer      source_tag);
 };
 
-GType g_async_result_get_type (void) G_GNUC_CONST;
+GLIB_AVAILABLE_IN_ALL
+GType    g_async_result_get_type          (void) G_GNUC_CONST;
 
+GLIB_AVAILABLE_IN_ALL
 gpointer g_async_result_get_user_data     (GAsyncResult *res);
+GLIB_AVAILABLE_IN_ALL
 GObject *g_async_result_get_source_object (GAsyncResult *res);
 
+GLIB_AVAILABLE_IN_2_34
+gboolean g_async_result_legacy_propagate_error (GAsyncResult  *res,
+                                               GError       **error);
+GLIB_AVAILABLE_IN_2_34
+gboolean g_async_result_is_tagged              (GAsyncResult  *res,
+                                               gpointer       source_tag);
+
 G_END_DECLS
 
 #endif /* __G_ASYNC_RESULT_H__ */