+Sat Oct 3 01:18:10 1998 Tim Janik <timj@gtk.org>
+
+ * glib.h:
+ * ghook.c:
+ (g_hook_list_invoke):
+ (g_hook_list_invoke):
+ (g_hook_list_marshal): properly handle the first valid hook to call,
+ it maybe IN_CALL already.
+ (g_hook_list_marshal): minor name change.
+
+Fri Oct 2 23:21:21 1998 Tim Janik <timj@gtk.org>
+
+ * glib.h:
+ * ghook.c: renamed GHook.id to GHook.hook_id so we don't get troubles
+ with ObjC which reserves "id" as a keyword (Raja R Harinath
+ <harinath@cs.umn.edu>).
+
Wed Sep 30 10:53:03 1998 Tim Janik <timj@gtk.org>
* Makefile.am: added ghook.c.
+Sat Oct 3 01:18:10 1998 Tim Janik <timj@gtk.org>
+
+ * glib.h:
+ * ghook.c:
+ (g_hook_list_invoke):
+ (g_hook_list_invoke):
+ (g_hook_list_marshal): properly handle the first valid hook to call,
+ it maybe IN_CALL already.
+ (g_hook_list_marshal): minor name change.
+
+Fri Oct 2 23:21:21 1998 Tim Janik <timj@gtk.org>
+
+ * glib.h:
+ * ghook.c: renamed GHook.id to GHook.hook_id so we don't get troubles
+ with ObjC which reserves "id" as a keyword (Raja R Harinath
+ <harinath@cs.umn.edu>).
+
Wed Sep 30 10:53:03 1998 Tim Janik <timj@gtk.org>
* Makefile.am: added ghook.c.
+Sat Oct 3 01:18:10 1998 Tim Janik <timj@gtk.org>
+
+ * glib.h:
+ * ghook.c:
+ (g_hook_list_invoke):
+ (g_hook_list_invoke):
+ (g_hook_list_marshal): properly handle the first valid hook to call,
+ it maybe IN_CALL already.
+ (g_hook_list_marshal): minor name change.
+
+Fri Oct 2 23:21:21 1998 Tim Janik <timj@gtk.org>
+
+ * glib.h:
+ * ghook.c: renamed GHook.id to GHook.hook_id so we don't get troubles
+ with ObjC which reserves "id" as a keyword (Raja R Harinath
+ <harinath@cs.umn.edu>).
+
Wed Sep 30 10:53:03 1998 Tim Janik <timj@gtk.org>
* Makefile.am: added ghook.c.
+Sat Oct 3 01:18:10 1998 Tim Janik <timj@gtk.org>
+
+ * glib.h:
+ * ghook.c:
+ (g_hook_list_invoke):
+ (g_hook_list_invoke):
+ (g_hook_list_marshal): properly handle the first valid hook to call,
+ it maybe IN_CALL already.
+ (g_hook_list_marshal): minor name change.
+
+Fri Oct 2 23:21:21 1998 Tim Janik <timj@gtk.org>
+
+ * glib.h:
+ * ghook.c: renamed GHook.id to GHook.hook_id so we don't get troubles
+ with ObjC which reserves "id" as a keyword (Raja R Harinath
+ <harinath@cs.umn.edu>).
+
Wed Sep 30 10:53:03 1998 Tim Janik <timj@gtk.org>
* Makefile.am: added ghook.c.
+Sat Oct 3 01:18:10 1998 Tim Janik <timj@gtk.org>
+
+ * glib.h:
+ * ghook.c:
+ (g_hook_list_invoke):
+ (g_hook_list_invoke):
+ (g_hook_list_marshal): properly handle the first valid hook to call,
+ it maybe IN_CALL already.
+ (g_hook_list_marshal): minor name change.
+
+Fri Oct 2 23:21:21 1998 Tim Janik <timj@gtk.org>
+
+ * glib.h:
+ * ghook.c: renamed GHook.id to GHook.hook_id so we don't get troubles
+ with ObjC which reserves "id" as a keyword (Raja R Harinath
+ <harinath@cs.umn.edu>).
+
Wed Sep 30 10:53:03 1998 Tim Janik <timj@gtk.org>
* Makefile.am: added ghook.c.
+Sat Oct 3 01:18:10 1998 Tim Janik <timj@gtk.org>
+
+ * glib.h:
+ * ghook.c:
+ (g_hook_list_invoke):
+ (g_hook_list_invoke):
+ (g_hook_list_marshal): properly handle the first valid hook to call,
+ it maybe IN_CALL already.
+ (g_hook_list_marshal): minor name change.
+
+Fri Oct 2 23:21:21 1998 Tim Janik <timj@gtk.org>
+
+ * glib.h:
+ * ghook.c: renamed GHook.id to GHook.hook_id so we don't get troubles
+ with ObjC which reserves "id" as a keyword (Raja R Harinath
+ <harinath@cs.umn.edu>).
+
Wed Sep 30 10:53:03 1998 Tim Janik <timj@gtk.org>
* Makefile.am: added ghook.c.
+Sat Oct 3 01:18:10 1998 Tim Janik <timj@gtk.org>
+
+ * glib.h:
+ * ghook.c:
+ (g_hook_list_invoke):
+ (g_hook_list_invoke):
+ (g_hook_list_marshal): properly handle the first valid hook to call,
+ it maybe IN_CALL already.
+ (g_hook_list_marshal): minor name change.
+
+Fri Oct 2 23:21:21 1998 Tim Janik <timj@gtk.org>
+
+ * glib.h:
+ * ghook.c: renamed GHook.id to GHook.hook_id so we don't get troubles
+ with ObjC which reserves "id" as a keyword (Raja R Harinath
+ <harinath@cs.umn.edu>).
+
Wed Sep 30 10:53:03 1998 Tim Janik <timj@gtk.org>
* Makefile.am: added ghook.c.
+Sat Oct 3 01:18:10 1998 Tim Janik <timj@gtk.org>
+
+ * glib.h:
+ * ghook.c:
+ (g_hook_list_invoke):
+ (g_hook_list_invoke):
+ (g_hook_list_marshal): properly handle the first valid hook to call,
+ it maybe IN_CALL already.
+ (g_hook_list_marshal): minor name change.
+
+Fri Oct 2 23:21:21 1998 Tim Janik <timj@gtk.org>
+
+ * glib.h:
+ * ghook.c: renamed GHook.id to GHook.hook_id so we don't get troubles
+ with ObjC which reserves "id" as a keyword (Raja R Harinath
+ <harinath@cs.umn.edu>).
+
Wed Sep 30 10:53:03 1998 Tim Janik <timj@gtk.org>
* Makefile.am: added ghook.c.
hook->prev = NULL;
hook->flags = G_HOOK_ACTIVE;
hook->ref_count = 0;
- hook->id = 0;
+ hook->hook_id = 0;
hook->func = NULL;
hook->destroy = NULL;
g_return_if_fail (hook_list != NULL);
g_return_if_fail (hook != NULL);
- if (hook->id)
+ if (hook->hook_id)
{
- hook->id = 0;
+ hook->hook_id = 0;
hook->flags &= ~G_HOOK_ACTIVE;
if (hook->destroy)
{
gboolean
g_hook_destroy (GHookList *hook_list,
- guint id)
+ guint hook_id)
{
GHook *hook;
g_return_val_if_fail (hook_list != NULL, FALSE);
- g_return_val_if_fail (id > 0, FALSE);
+ g_return_val_if_fail (hook_id > 0, FALSE);
- hook = g_hook_get (hook_list, id);
+ hook = g_hook_get (hook_list, hook_id);
if (hook)
{
g_hook_destroy_link (hook_list, hook);
hook->ref_count--;
if (!hook->ref_count)
{
- g_return_if_fail (hook->id == 0);
+ g_return_if_fail (hook->hook_id == 0);
g_return_if_fail (!G_HOOK_IS_IN_CALL (hook));
if (hook->prev)
g_return_if_fail (G_HOOK_IS_UNLINKED (hook));
g_return_if_fail (hook->func != NULL);
- hook->id = hook_list->seq_id++;
+ hook->hook_id = hook_list->seq_id++;
hook->ref_count = 1; /* counterpart to g_hook_destroy_link */
if (sibling)
g_return_if_fail (hook_list != NULL);
g_return_if_fail (hook_list->is_setup);
-
- hook = g_hook_first_valid (hook_list);
+
+ if (may_recurse)
+ hook = g_hook_first_valid (hook_list);
+ else
+ do
+ hook = g_hook_first_valid (hook_list);
+ while (hook && G_HOOK_IS_IN_CALL (hook));
while (hook)
{
register GHook *tmp;
g_return_if_fail (hook_list != NULL);
g_return_if_fail (hook_list->is_setup);
- hook = g_hook_first_valid (hook_list);
+ if (may_recurse)
+ hook = g_hook_first_valid (hook_list);
+ else
+ do
+ hook = g_hook_first_valid (hook_list);
+ while (hook && G_HOOK_IS_IN_CALL (hook));
while (hook)
{
register GHook *tmp;
}
void
-g_hook_list_marshall (GHookList *hook_list,
- gboolean may_recurse,
- GHookMarshaller marshaller,
- gpointer data)
+g_hook_list_marshal (GHookList *hook_list,
+ gboolean may_recurse,
+ GHookMarshaller marshaller,
+ gpointer data)
{
GHook *hook;
g_return_if_fail (hook_list->is_setup);
g_return_if_fail (marshaller != NULL);
- hook = g_hook_first_valid (hook_list);
+ if (may_recurse)
+ hook = g_hook_first_valid (hook_list);
+ else
+ do
+ hook = g_hook_first_valid (hook_list);
+ while (hook && G_HOOK_IS_IN_CALL (hook));
while (hook)
{
register GHook *tmp;
GHook*
g_hook_get (GHookList *hook_list,
- guint id)
+ guint hook_id)
{
GHook *hook;
g_return_val_if_fail (hook_list != NULL, NULL);
- g_return_val_if_fail (id > 0, NULL);
+ g_return_val_if_fail (hook_id > 0, NULL);
hook = hook_list->hooks;
while (hook)
{
- if (hook->id == id)
+ if (hook->hook_id == hook_id)
return hook;
hook = hook->next;
}
g_hook_ref (hook_list, hook);
- if (func (hook, data) && hook->id && (!need_valids || G_HOOK_IS_ACTIVE (hook)))
+ if (func (hook, data) && hook->hook_id && (!need_valids || G_HOOK_IS_ACTIVE (hook)))
{
g_hook_unref (hook_list, hook);
hook = g_hook_first_valid (hook_list);
while (hook)
{
- if (hook->data == data && hook->id && (!need_valids || G_HOOK_IS_ACTIVE (hook)))
+ if (hook->data == data && hook->hook_id && (!need_valids || G_HOOK_IS_ACTIVE (hook)))
return hook;
hook = g_hook_next_valid (hook);
hook = g_hook_first_valid (hook_list);
while (hook)
{
- if (hook->func == func && hook->id && (!need_valids || G_HOOK_IS_ACTIVE (hook)))
+ if (hook->func == func && hook->hook_id && (!need_valids || G_HOOK_IS_ACTIVE (hook)))
return hook;
hook = g_hook_next_valid (hook);
hook = g_hook_first_valid (hook_list);
while (hook)
{
- if (hook->data == data && hook->func == func && hook->id && (!need_valids || G_HOOK_IS_ACTIVE (hook)))
+ if (hook->data == data && hook->func == func && hook->hook_id && (!need_valids || G_HOOK_IS_ACTIVE (hook)))
return hook;
hook = g_hook_next_valid (hook);
register GHook *tmp;
g_hook_ref (hook_list, sibling);
- if (func (hook, sibling) <= 0 && sibling->id)
+ if (func (hook, sibling) <= 0 && sibling->hook_id)
{
g_hook_unref (hook_list, sibling);
break;
g_hook_compare_ids (GHook *new_hook,
GHook *sibling)
{
- return ((glong) new_hook->id) - ((glong) sibling->id);
+ return ((glong) new_hook->hook_id) - ((glong) sibling->hook_id);
}
GHook *next;
GHook *prev;
guint ref_count;
- guint id;
+ guint hook_id;
guint flags;
gpointer func;
GDestroyNotify destroy;
G_HOOK_ACTIVE) != 0)
#define G_HOOK_IS_IN_CALL(hook) ((((GHook*) hook)->flags & \
G_HOOK_IN_CALL) != 0)
-#define G_HOOK_IS_VALID(hook) (((GHook*) hook)->id != 0 && \
+#define G_HOOK_IS_VALID(hook) (((GHook*) hook)->hook_id != 0 && \
G_HOOK_IS_ACTIVE (hook))
#define G_HOOK_IS_UNLINKED(hook) (((GHook*) hook)->next == NULL && \
((GHook*) hook)->prev == NULL && \
- ((GHook*) hook)->id == 0 && \
+ ((GHook*) hook)->hook_id == 0 && \
((GHook*) hook)->ref_count == 0)
void g_hook_list_init (GHookList *hook_list,
void g_hook_unref (GHookList *hook_list,
GHook *hook);
gboolean g_hook_destroy (GHookList *hook_list,
- guint id);
+ guint hook_id);
void g_hook_destroy_link (GHookList *hook_list,
GHook *hook);
void g_hook_prepend (GHookList *hook_list,
GHook *hook,
GHookCompareFunc func);
GHook* g_hook_get (GHookList *hook_list,
- guint id);
+ guint hook_id);
GHook* g_hook_find (GHookList *hook_list,
gboolean need_valids,
GHookFindFunc func,
gboolean may_recurse);
/* invoke a marshaller on all valid hooks.
*/
-void g_hook_list_marshall (GHookList *hook_list,
+void g_hook_list_marshal (GHookList *hook_list,
gboolean may_recurse,
GHookMarshaller marshaller,
gpointer data);
hook->prev = NULL;
hook->flags = G_HOOK_ACTIVE;
hook->ref_count = 0;
- hook->id = 0;
+ hook->hook_id = 0;
hook->func = NULL;
hook->destroy = NULL;
g_return_if_fail (hook_list != NULL);
g_return_if_fail (hook != NULL);
- if (hook->id)
+ if (hook->hook_id)
{
- hook->id = 0;
+ hook->hook_id = 0;
hook->flags &= ~G_HOOK_ACTIVE;
if (hook->destroy)
{
gboolean
g_hook_destroy (GHookList *hook_list,
- guint id)
+ guint hook_id)
{
GHook *hook;
g_return_val_if_fail (hook_list != NULL, FALSE);
- g_return_val_if_fail (id > 0, FALSE);
+ g_return_val_if_fail (hook_id > 0, FALSE);
- hook = g_hook_get (hook_list, id);
+ hook = g_hook_get (hook_list, hook_id);
if (hook)
{
g_hook_destroy_link (hook_list, hook);
hook->ref_count--;
if (!hook->ref_count)
{
- g_return_if_fail (hook->id == 0);
+ g_return_if_fail (hook->hook_id == 0);
g_return_if_fail (!G_HOOK_IS_IN_CALL (hook));
if (hook->prev)
g_return_if_fail (G_HOOK_IS_UNLINKED (hook));
g_return_if_fail (hook->func != NULL);
- hook->id = hook_list->seq_id++;
+ hook->hook_id = hook_list->seq_id++;
hook->ref_count = 1; /* counterpart to g_hook_destroy_link */
if (sibling)
g_return_if_fail (hook_list != NULL);
g_return_if_fail (hook_list->is_setup);
-
- hook = g_hook_first_valid (hook_list);
+
+ if (may_recurse)
+ hook = g_hook_first_valid (hook_list);
+ else
+ do
+ hook = g_hook_first_valid (hook_list);
+ while (hook && G_HOOK_IS_IN_CALL (hook));
while (hook)
{
register GHook *tmp;
g_return_if_fail (hook_list != NULL);
g_return_if_fail (hook_list->is_setup);
- hook = g_hook_first_valid (hook_list);
+ if (may_recurse)
+ hook = g_hook_first_valid (hook_list);
+ else
+ do
+ hook = g_hook_first_valid (hook_list);
+ while (hook && G_HOOK_IS_IN_CALL (hook));
while (hook)
{
register GHook *tmp;
}
void
-g_hook_list_marshall (GHookList *hook_list,
- gboolean may_recurse,
- GHookMarshaller marshaller,
- gpointer data)
+g_hook_list_marshal (GHookList *hook_list,
+ gboolean may_recurse,
+ GHookMarshaller marshaller,
+ gpointer data)
{
GHook *hook;
g_return_if_fail (hook_list->is_setup);
g_return_if_fail (marshaller != NULL);
- hook = g_hook_first_valid (hook_list);
+ if (may_recurse)
+ hook = g_hook_first_valid (hook_list);
+ else
+ do
+ hook = g_hook_first_valid (hook_list);
+ while (hook && G_HOOK_IS_IN_CALL (hook));
while (hook)
{
register GHook *tmp;
GHook*
g_hook_get (GHookList *hook_list,
- guint id)
+ guint hook_id)
{
GHook *hook;
g_return_val_if_fail (hook_list != NULL, NULL);
- g_return_val_if_fail (id > 0, NULL);
+ g_return_val_if_fail (hook_id > 0, NULL);
hook = hook_list->hooks;
while (hook)
{
- if (hook->id == id)
+ if (hook->hook_id == hook_id)
return hook;
hook = hook->next;
}
g_hook_ref (hook_list, hook);
- if (func (hook, data) && hook->id && (!need_valids || G_HOOK_IS_ACTIVE (hook)))
+ if (func (hook, data) && hook->hook_id && (!need_valids || G_HOOK_IS_ACTIVE (hook)))
{
g_hook_unref (hook_list, hook);
hook = g_hook_first_valid (hook_list);
while (hook)
{
- if (hook->data == data && hook->id && (!need_valids || G_HOOK_IS_ACTIVE (hook)))
+ if (hook->data == data && hook->hook_id && (!need_valids || G_HOOK_IS_ACTIVE (hook)))
return hook;
hook = g_hook_next_valid (hook);
hook = g_hook_first_valid (hook_list);
while (hook)
{
- if (hook->func == func && hook->id && (!need_valids || G_HOOK_IS_ACTIVE (hook)))
+ if (hook->func == func && hook->hook_id && (!need_valids || G_HOOK_IS_ACTIVE (hook)))
return hook;
hook = g_hook_next_valid (hook);
hook = g_hook_first_valid (hook_list);
while (hook)
{
- if (hook->data == data && hook->func == func && hook->id && (!need_valids || G_HOOK_IS_ACTIVE (hook)))
+ if (hook->data == data && hook->func == func && hook->hook_id && (!need_valids || G_HOOK_IS_ACTIVE (hook)))
return hook;
hook = g_hook_next_valid (hook);
register GHook *tmp;
g_hook_ref (hook_list, sibling);
- if (func (hook, sibling) <= 0 && sibling->id)
+ if (func (hook, sibling) <= 0 && sibling->hook_id)
{
g_hook_unref (hook_list, sibling);
break;
g_hook_compare_ids (GHook *new_hook,
GHook *sibling)
{
- return ((glong) new_hook->id) - ((glong) sibling->id);
+ return ((glong) new_hook->hook_id) - ((glong) sibling->hook_id);
}
GHook *next;
GHook *prev;
guint ref_count;
- guint id;
+ guint hook_id;
guint flags;
gpointer func;
GDestroyNotify destroy;
G_HOOK_ACTIVE) != 0)
#define G_HOOK_IS_IN_CALL(hook) ((((GHook*) hook)->flags & \
G_HOOK_IN_CALL) != 0)
-#define G_HOOK_IS_VALID(hook) (((GHook*) hook)->id != 0 && \
+#define G_HOOK_IS_VALID(hook) (((GHook*) hook)->hook_id != 0 && \
G_HOOK_IS_ACTIVE (hook))
#define G_HOOK_IS_UNLINKED(hook) (((GHook*) hook)->next == NULL && \
((GHook*) hook)->prev == NULL && \
- ((GHook*) hook)->id == 0 && \
+ ((GHook*) hook)->hook_id == 0 && \
((GHook*) hook)->ref_count == 0)
void g_hook_list_init (GHookList *hook_list,
void g_hook_unref (GHookList *hook_list,
GHook *hook);
gboolean g_hook_destroy (GHookList *hook_list,
- guint id);
+ guint hook_id);
void g_hook_destroy_link (GHookList *hook_list,
GHook *hook);
void g_hook_prepend (GHookList *hook_list,
GHook *hook,
GHookCompareFunc func);
GHook* g_hook_get (GHookList *hook_list,
- guint id);
+ guint hook_id);
GHook* g_hook_find (GHookList *hook_list,
gboolean need_valids,
GHookFindFunc func,
gboolean may_recurse);
/* invoke a marshaller on all valid hooks.
*/
-void g_hook_list_marshall (GHookList *hook_list,
+void g_hook_list_marshal (GHookList *hook_list,
gboolean may_recurse,
GHookMarshaller marshaller,
gpointer data);