luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-06-02 02:40:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

eek, fixed old hook detail storage code.

Browse Source 
Thu Mar  8 18:11:52 2001  Tim Janik  <timj@gtk.org>

        * gsignal.c: eek, fixed old hook detail storage code.
This commit is contained in:
Tim Janik 2001-03-08 17:11:42 +00:00 committed by Tim Janik
parent 617332234d
commit 9490f8d7e4
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gobject/ChangeLog
View File

@ -1,3 +1,7 @@
Thu Mar 8 18:11:52 2001 Tim Janik <timj@gtk.org>
* gsignal.c: eek, fixed old hook detail storage code.
Thu Mar 8 16:35:48 2001 Tim Janik <timj@gtk.org> Thu Mar 8 16:35:48 2001 Tim Janik <timj@gtk.org>
* gparamspecs.[hc]: s/g_param_spec_string_c/g_param_spec_stringc/. * gparamspecs.[hc]: s/g_param_spec_string_c/g_param_spec_stringc/.

18
gobject/gsignal.c
View File

@ -154,6 +154,13 @@ typedef struct
GSignalAccumulator func; GSignalAccumulator func;
gpointer data; gpointer data;
} SignalAccumulator; } SignalAccumulator;
typedef struct
{
GHook hook;
GQuark detail;
} SignalHook;
#define SIGNAL_HOOK(hook) ((SignalHook*) (hook))
struct _SignalNode struct _SignalNode
{ {
/* permanent portion */ /* permanent portion */
@ -755,6 +762,7 @@ g_signal_add_emission_hook (guint signal_id,
static guint seq_hook_id = 1; static guint seq_hook_id = 1;
SignalNode *node; SignalNode *node;
GHook *hook; GHook *hook;
SignalHook *signal_hook;
g_return_val_if_fail (signal_id > 0, 0); g_return_val_if_fail (signal_id > 0, 0);
g_return_val_if_fail (hook_func != NULL, 0); g_return_val_if_fail (hook_func != NULL, 0);
@ -776,13 +784,15 @@ g_signal_add_emission_hook (guint signal_id,
if (!node->emission_hooks) if (!node->emission_hooks)
{ {
node->emission_hooks = g_new (GHookList, 1); node->emission_hooks = g_new (GHookList, 1);
g_hook_list_init (node->emission_hooks, sizeof (GHook)); g_hook_list_init (node->emission_hooks, sizeof (SignalHook));
node->emission_hooks->finalize_hook = signal_finalize_hook; node->emission_hooks->finalize_hook = signal_finalize_hook;
} }
hook = g_hook_alloc (node->emission_hooks); hook = g_hook_alloc (node->emission_hooks);
hook->data = hook_data; hook->data = hook_data;
hook->func = hook_func; hook->func = hook_func;
hook->destroy = data_destroy; hook->destroy = data_destroy;
signal_hook = SIGNAL_HOOK (hook);
signal_hook->detail = detail;
node->emission_hooks->seq_id = seq_hook_id; node->emission_hooks->seq_id = seq_hook_id;
g_hook_append (node->emission_hooks, hook); g_hook_append (node->emission_hooks, hook);
seq_hook_id = node->emission_hooks->seq_id; seq_hook_id = node->emission_hooks->seq_id;
@ -1945,14 +1955,14 @@ signal_emit_R (SignalNode *node,
{ {
gboolean need_destroy, was_in_call, may_recurse = TRUE; gboolean need_destroy, was_in_call, may_recurse = TRUE;
GHook *hook; GHook *hook;
emission_state = EMISSION_HOOK; emission_state = EMISSION_HOOK;
hook = g_hook_first_valid (node->emission_hooks, may_recurse); hook = g_hook_first_valid (node->emission_hooks, may_recurse);
while (hook) while (hook)
{ {
GQuark hook_detail = GPOINTER_TO_UINT (hook->func); SignalHook *signal_hook = SIGNAL_HOOK (hook);
if (!hook_detail || hook_detail == detail) if (!signal_hook->detail || signal_hook->detail == detail)
{ {
GSignalEmissionHook hook_func = hook->func; GSignalEmissionHook hook_func = hook->func;