properly handle the first valid hook to call, it maybe IN_CALL already.

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>).

12 files changed, 228 insertions, 62 deletions

diff --git a/ChangeLog b/ChangeLog
index f33a37135..946e04c26 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+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.
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index f33a37135..946e04c26 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,20 @@
+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.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f33a37135..946e04c26 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,20 @@
+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.
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index f33a37135..946e04c26 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,20 @@
+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.
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index f33a37135..946e04c26 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,20 @@
+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.
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index f33a37135..946e04c26 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,20 @@
+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.
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index f33a37135..946e04c26 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,20 @@
+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.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index f33a37135..946e04c26 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,20 @@
+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.
diff --git a/ghook.c b/ghook.c
index 2ac657519..c81a84640 100644
--- a/ghook.c
+++ b/ghook.c
@@ -90,7 +90,7 @@ g_hook_alloc (GHookList *hook_list)
   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;
   
@@ -116,9 +116,9 @@ g_hook_destroy_link (GHookList *hook_list,
   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)
 	{
@@ -134,14 +134,14 @@ g_hook_destroy_link (GHookList *hook_list,
 
 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);
@@ -162,7 +162,7 @@ g_hook_unref (GHookList *hook_list,
   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)
@@ -218,7 +218,7 @@ g_hook_insert_before (GHookList *hook_list,
   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)
@@ -260,8 +260,13 @@ g_hook_list_invoke (GHookList *hook_list,
   
   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;
@@ -298,7 +303,12 @@ g_hook_list_invoke_check (GHookList *hook_list,
   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;
@@ -330,10 +340,10 @@ g_hook_list_invoke_check (GHookList *hook_list,
 }
 
 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;
   
@@ -341,7 +351,12 @@ g_hook_list_marshall (GHookList		     *hook_list,
   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;
@@ -408,17 +423,17 @@ g_hook_next_valid (GHook *hook)
 
 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;
     }
@@ -444,7 +459,7 @@ g_hook_find (GHookList	  *hook_list,
       
       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);
 	  
@@ -470,7 +485,7 @@ g_hook_find_data (GHookList *hook_list,
   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);
@@ -492,7 +507,7 @@ g_hook_find_func (GHookList *hook_list,
   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);
@@ -515,7 +530,7 @@ g_hook_find_func_data (GHookList *hook_list,
   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);
@@ -545,7 +560,7 @@ g_hook_insert_sorted (GHookList	      *hook_list,
       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;
@@ -562,5 +577,5 @@ gint
 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);
 }
diff --git a/glib.h b/glib.h
index 2e19a3c91..949247d5a 100644
--- a/glib.h
+++ b/glib.h
@@ -1030,7 +1030,7 @@ struct _GHook
   GHook		*next;
   GHook		*prev;
   guint		 ref_count;
-  guint		 id;
+  guint		 hook_id;
   guint		 flags;
   gpointer	 func;
   GDestroyNotify destroy;
@@ -1040,11 +1040,11 @@ struct _GHook
 					  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,
@@ -1058,7 +1058,7 @@ void	 g_hook_ref			(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,
@@ -1070,7 +1070,7 @@ void	 g_hook_insert_sorted		(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,
@@ -1105,7 +1105,7 @@ void	 g_hook_list_invoke_check	(GHookList		*hook_list,
 					 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);
diff --git a/glib/ghook.c b/glib/ghook.c
index 2ac657519..c81a84640 100644
--- a/glib/ghook.c
+++ b/glib/ghook.c
@@ -90,7 +90,7 @@ g_hook_alloc (GHookList *hook_list)
   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;
   
@@ -116,9 +116,9 @@ g_hook_destroy_link (GHookList *hook_list,
   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)
 	{
@@ -134,14 +134,14 @@ g_hook_destroy_link (GHookList *hook_list,
 
 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);
@@ -162,7 +162,7 @@ g_hook_unref (GHookList *hook_list,
   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)
@@ -218,7 +218,7 @@ g_hook_insert_before (GHookList *hook_list,
   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)
@@ -260,8 +260,13 @@ g_hook_list_invoke (GHookList *hook_list,
   
   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;
@@ -298,7 +303,12 @@ g_hook_list_invoke_check (GHookList *hook_list,
   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;
@@ -330,10 +340,10 @@ g_hook_list_invoke_check (GHookList *hook_list,
 }
 
 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;
   
@@ -341,7 +351,12 @@ g_hook_list_marshall (GHookList		     *hook_list,
   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;
@@ -408,17 +423,17 @@ g_hook_next_valid (GHook *hook)
 
 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;
     }
@@ -444,7 +459,7 @@ g_hook_find (GHookList	  *hook_list,
       
       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);
 	  
@@ -470,7 +485,7 @@ g_hook_find_data (GHookList *hook_list,
   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);
@@ -492,7 +507,7 @@ g_hook_find_func (GHookList *hook_list,
   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);
@@ -515,7 +530,7 @@ g_hook_find_func_data (GHookList *hook_list,
   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);
@@ -545,7 +560,7 @@ g_hook_insert_sorted (GHookList	      *hook_list,
       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;
@@ -562,5 +577,5 @@ gint
 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);
 }
diff --git a/glib/glib.h b/glib/glib.h
index 2e19a3c91..949247d5a 100644
--- a/glib/glib.h
+++ b/glib/glib.h
@@ -1030,7 +1030,7 @@ struct _GHook
   GHook		*next;
   GHook		*prev;
   guint		 ref_count;
-  guint		 id;
+  guint		 hook_id;
   guint		 flags;
   gpointer	 func;
   GDestroyNotify destroy;
@@ -1040,11 +1040,11 @@ struct _GHook
 					  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,
@@ -1058,7 +1058,7 @@ void	 g_hook_ref			(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,
@@ -1070,7 +1070,7 @@ void	 g_hook_insert_sorted		(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,
@@ -1105,7 +1105,7 @@ void	 g_hook_list_invoke_check	(GHookList		*hook_list,
 					 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);