From ea9a7199a17a8f391cb3a4b0c40606c3d628e015 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 6 Mar 2003 22:41:03 +0000 Subject: [PATCH] Fix FALSE/NULL confusion. (#107646, Morten Welinder) 2003-03-06 Matthias Clasen * glib/gmain.c (g_main_context_find_source_by_id): (g_main_context_find_source_by_funcs_user_data): Fix FALSE/NULL confusion. (#107646, Morten Welinder) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-12 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ glib/gmain.c | 4 ++-- 7 files changed, 38 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b049243..3c066e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2003-03-06 Matthias Clasen + + * glib/gmain.c (g_main_context_find_source_by_id): + (g_main_context_find_source_by_funcs_user_data): Fix FALSE/NULL + confusion. (#107646, Morten Welinder) + 2003-03-01 James Henstridge * autogen.sh: require automake 1.7. Add calls to libtoolize and diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index b049243..3c066e3 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2003-03-06 Matthias Clasen + + * glib/gmain.c (g_main_context_find_source_by_id): + (g_main_context_find_source_by_funcs_user_data): Fix FALSE/NULL + confusion. (#107646, Morten Welinder) + 2003-03-01 James Henstridge * autogen.sh: require automake 1.7. Add calls to libtoolize and diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index b049243..3c066e3 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,9 @@ +2003-03-06 Matthias Clasen + + * glib/gmain.c (g_main_context_find_source_by_id): + (g_main_context_find_source_by_funcs_user_data): Fix FALSE/NULL + confusion. (#107646, Morten Welinder) + 2003-03-01 James Henstridge * autogen.sh: require automake 1.7. Add calls to libtoolize and diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index b049243..3c066e3 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +2003-03-06 Matthias Clasen + + * glib/gmain.c (g_main_context_find_source_by_id): + (g_main_context_find_source_by_funcs_user_data): Fix FALSE/NULL + confusion. (#107646, Morten Welinder) + 2003-03-01 James Henstridge * autogen.sh: require automake 1.7. Add calls to libtoolize and diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index b049243..3c066e3 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +2003-03-06 Matthias Clasen + + * glib/gmain.c (g_main_context_find_source_by_id): + (g_main_context_find_source_by_funcs_user_data): Fix FALSE/NULL + confusion. (#107646, Morten Welinder) + 2003-03-01 James Henstridge * autogen.sh: require automake 1.7. Add calls to libtoolize and diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index b049243..3c066e3 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2003-03-06 Matthias Clasen + + * glib/gmain.c (g_main_context_find_source_by_id): + (g_main_context_find_source_by_funcs_user_data): Fix FALSE/NULL + confusion. (#107646, Morten Welinder) + 2003-03-01 James Henstridge * autogen.sh: require automake 1.7. Add calls to libtoolize and diff --git a/glib/gmain.c b/glib/gmain.c index 92bd020..3f7d70e 100644 --- a/glib/gmain.c +++ b/glib/gmain.c @@ -1367,7 +1367,7 @@ g_main_context_find_source_by_id (GMainContext *context, { GSource *source; - g_return_val_if_fail (source_id > 0, FALSE); + g_return_val_if_fail (source_id > 0, NULL); if (context == NULL) context = g_main_context_default (); @@ -1407,7 +1407,7 @@ g_main_context_find_source_by_funcs_user_data (GMainContext *context, { GSource *source; - g_return_val_if_fail (funcs != NULL, FALSE); + g_return_val_if_fail (funcs != NULL, NULL); if (context == NULL) context = g_main_context_default (); -- 2.7.4