From fc323595ff1b74b70eb592febf248964a586a9e8 Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Tue, 22 Dec 1998 10:09:28 +0000 Subject: [PATCH] fixed buglet that could cause bogus warnings. Tue Dec 22 10:32:11 1998 Tim Janik * ghook.c (g_hook_first_valid): fixed buglet that could cause bogus warnings. --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ ghook.c | 2 +- glib/ghook.c | 2 +- 10 files changed, 42 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 07e4961..1daff07 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Dec 22 10:32:11 1998 Tim Janik + + * ghook.c (g_hook_first_valid): fixed buglet that could cause bogus + warnings. + Mon Dec 21 21:48:29 1998 Tim Janik * glib.h: diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 07e4961..1daff07 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Tue Dec 22 10:32:11 1998 Tim Janik + + * ghook.c (g_hook_first_valid): fixed buglet that could cause bogus + warnings. + Mon Dec 21 21:48:29 1998 Tim Janik * glib.h: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 07e4961..1daff07 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Tue Dec 22 10:32:11 1998 Tim Janik + + * ghook.c (g_hook_first_valid): fixed buglet that could cause bogus + warnings. + Mon Dec 21 21:48:29 1998 Tim Janik * glib.h: diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 07e4961..1daff07 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +Tue Dec 22 10:32:11 1998 Tim Janik + + * ghook.c (g_hook_first_valid): fixed buglet that could cause bogus + warnings. + Mon Dec 21 21:48:29 1998 Tim Janik * glib.h: diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 07e4961..1daff07 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Tue Dec 22 10:32:11 1998 Tim Janik + + * ghook.c (g_hook_first_valid): fixed buglet that could cause bogus + warnings. + Mon Dec 21 21:48:29 1998 Tim Janik * glib.h: diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 07e4961..1daff07 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Tue Dec 22 10:32:11 1998 Tim Janik + + * ghook.c (g_hook_first_valid): fixed buglet that could cause bogus + warnings. + Mon Dec 21 21:48:29 1998 Tim Janik * glib.h: diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 07e4961..1daff07 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Tue Dec 22 10:32:11 1998 Tim Janik + + * ghook.c (g_hook_first_valid): fixed buglet that could cause bogus + warnings. + Mon Dec 21 21:48:29 1998 Tim Janik * glib.h: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 07e4961..1daff07 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Tue Dec 22 10:32:11 1998 Tim Janik + + * ghook.c (g_hook_first_valid): fixed buglet that could cause bogus + warnings. + Mon Dec 21 21:48:29 1998 Tim Janik * glib.h: diff --git a/ghook.c b/ghook.c index 8705e63..b9d7adb 100644 --- a/ghook.c +++ b/ghook.c @@ -408,9 +408,9 @@ g_hook_first_valid (GHookList *hook_list, GHook *hook; hook = hook_list->hooks; - g_hook_ref (hook_list, hook); if (hook) { + g_hook_ref (hook_list, hook); if (G_HOOK_IS_VALID (hook) && (may_be_in_call || !G_HOOK_IN_CALL (hook))) return hook; else diff --git a/glib/ghook.c b/glib/ghook.c index 8705e63..b9d7adb 100644 --- a/glib/ghook.c +++ b/glib/ghook.c @@ -408,9 +408,9 @@ g_hook_first_valid (GHookList *hook_list, GHook *hook; hook = hook_list->hooks; - g_hook_ref (hook_list, hook); if (hook) { + g_hook_ref (hook_list, hook); if (G_HOOK_IS_VALID (hook) && (may_be_in_call || !G_HOOK_IN_CALL (hook))) return hook; else -- 2.7.4