[kdbus] sync with kdbus (kdbus.h - commit: 5ae1ecac44cb)

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

diff --git a/gio/gasyncresult.h b/gio/gasyncresult.h
index 640d611..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,21 +13,19 @@
  * 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>
  */
 
+#ifndef __G_ASYNC_RESULT_H__
+#define __G_ASYNC_RESULT_H__
+
 #if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
 #error "Only <gio/gio.h> can be included directly."
 #endif
 
-#ifndef __G_ASYNC_RESULT_H__
-#define __G_ASYNC_RESULT_H__
-
-#include <glib-object.h>
+#include <gio/giotypes.h>
 
 G_BEGIN_DECLS
 
@@ -39,30 +37,18 @@ G_BEGIN_DECLS
 /**
  * GAsyncResult:
  *
- * Holds results information for an asynchronous operation, 
+ * Holds results information for an asynchronous operation,
  * usually passed directly to a asynchronous _finish() operation.
  **/
-typedef struct _GAsyncResult         GAsyncResult; /* Dummy typedef */
 typedef struct _GAsyncResultIface    GAsyncResultIface;
 
-/**
- * GAsyncReadyCallback:
- * @source_object: the object the asynchronous operation was started with.
- * @res: a #GAsyncResult.
- * @user_data: user data passed to the callback.
- *
- * Type definition for a function that will be called back when an asynchronous 
- * operation within GIO has been completed. 
- **/
-typedef void (*GAsyncReadyCallback) (GObject *source_object,
-                                    GAsyncResult *res,
-                                    gpointer user_data);
 
 /**
  * GAsyncResultIface:
- * @g_iface: The parent interface. 
+ * @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.
  **/
@@ -72,15 +58,28 @@ struct _GAsyncResultIface
 
   /* 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__ */