GSocket: Reset the timeout in the GSocket GSource after it was triggered

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

diff --git a/gio/gcancellable.h b/gio/gcancellable.h
index 364311f..d8fa633 100644 (file)
--- a/gio/gcancellable.h
+++ b/gio/gcancellable.h
@@ -44,6 +44,15 @@ G_BEGIN_DECLS
  * Allows actions to be cancelled.
  */
 typedef struct _GCancellableClass   GCancellableClass;
+typedef struct _GCancellablePrivate GCancellablePrivate;
+
+struct _GCancellable
+{
+  GObject parent_instance;
+
+  /*< private >*/
+  GCancellablePrivate *priv;
+};
 
 struct _GCancellableClass
 {
@@ -68,11 +77,24 @@ GCancellable *g_cancellable_new                    (void);
 gboolean      g_cancellable_is_cancelled           (GCancellable  *cancellable);
 gboolean      g_cancellable_set_error_if_cancelled (GCancellable  *cancellable,
                                                    GError       **error);
+
 int           g_cancellable_get_fd                 (GCancellable  *cancellable);
+gboolean      g_cancellable_make_pollfd            (GCancellable  *cancellable,
+                                                   GPollFD       *pollfd);
+void          g_cancellable_release_fd             (GCancellable  *cancellable);
+
+GSource *     g_cancellable_source_new             (GCancellable  *cancellable);
+
 GCancellable *g_cancellable_get_current            (void);
 void          g_cancellable_push_current           (GCancellable  *cancellable);
 void          g_cancellable_pop_current            (GCancellable  *cancellable);
 void          g_cancellable_reset                  (GCancellable  *cancellable);
+gulong        g_cancellable_connect                (GCancellable  *cancellable,
+                                                   GCallback      callback,
+                                                   gpointer       data,
+                                                   GDestroyNotify data_destroy_func);
+void          g_cancellable_disconnect             (GCancellable  *cancellable,
+                                                   gulong         handler_id);
 
 
 /* This is safe to call from another thread */