summaryrefslogtreecommitdiff
path: root/gobject/gclosure.h
diff options
context:
space:
mode:
authorTim Janik <timj@gtk.org>2000-10-27 16:48:11 +0000
committerTim Janik <timj@src.gnome.org>2000-10-27 16:48:11 +0000
commit830d808c5ce0d94524807d4777a4c8257efcbf8a (patch)
tree9af6c238276c1970cab9da9f68283acfa6795278 /gobject/gclosure.h
parente6dfecacc0d15275b8f94b9ab963f8cc49154105 (diff)
downloadglib-830d808c5ce0d94524807d4777a4c8257efcbf8a.tar.gz
publically define GSignalInvocationHint structure that gets passed in to
Fri Oct 27 16:33:41 2000 Tim Janik <timj@gtk.org> * gsignal.[hc]: publically define GSignalInvocationHint structure that gets passed in to closure invocations. added signal details. renamed GSignalType to GSignalFlags to comply with conventions. quite some cleanups and minor fixes. avoid uneccessary handler list walks upon invokation of after handlers. relookup handler list for restarted emissions. preliminary abort normal handler invokation if after handler is encountered. * glib-genmarshal.c: * gclosure.[hc]: moved invocation_hint to the end of the g_closure_invoke() arguments as sugegsted by kenelson. also made it a gpointer to be more generic. the invocation_hint is a caller specific thing that can be used to pass additional data in to closure invocations as documented with the caller invoking the closure.
Diffstat (limited to 'gobject/gclosure.h')
-rw-r--r--gobject/gclosure.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/gobject/gclosure.h b/gobject/gclosure.h
index 423ccebb4..2ca0f3fa3 100644
--- a/gobject/gclosure.h
+++ b/gobject/gclosure.h
@@ -41,10 +41,10 @@ typedef gpointer GCallback;
typedef void (*GClosureNotify) (gpointer data,
GClosure *closure);
typedef void (*GClosureMarshal) (GClosure *closure,
- guint invocation_hint,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
+ gpointer invocation_hint,
gpointer marshal_data);
typedef struct _GCClosure GCClosure;
@@ -69,10 +69,10 @@ struct _GClosure
/*< public >*/ guint is_invalid : 1;
/*< private >*/ void (*marshal) (GClosure *closure,
- guint invocation_hint,
GValue /*out*/ *return_value,
guint n_param_values,
const GValue *param_values,
+ gpointer invocation_hint,
gpointer marshal_data);
/*< protected >*/ gpointer data;
@@ -139,10 +139,10 @@ void g_closure_set_meta_marshal (GClosure *closure,
GClosureMarshal meta_marshal);
void g_closure_invalidate (GClosure *closure);
void g_closure_invoke (GClosure *closure,
- guint invocation_hint,
GValue /*out*/ *return_value,
guint n_param_values,
- const GValue *param_values);
+ const GValue *param_values,
+ gpointer invocation_hint);
/*