From 2022eaf0ab83fc28f41e7807c87c349aa8d0d79f Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 20 Sep 2004 03:58:04 +0000 Subject: [PATCH] Call error_func on error, not post_parse_func again. (#153107, Robert MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Sun Sep 19 23:56:15 2004 Matthias Clasen * glib/goption.c (g_option_context_parse): Call error_func on error, not post_parse_func again. (#153107, Robert Ögren) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ glib/goption.c | 4 ++-- 6 files changed, 27 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 320ed79b..50b49640 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Sep 19 23:56:15 2004 Matthias Clasen + + * glib/goption.c (g_option_context_parse): Call error_func + on error, not post_parse_func again. (#153107, Robert Ögren) + Sun Sep 19 23:52:35 2004 Matthias Clasen * glib/gmessages.c (mklevel_prefix): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 320ed79b..50b49640 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Sun Sep 19 23:56:15 2004 Matthias Clasen + + * glib/goption.c (g_option_context_parse): Call error_func + on error, not post_parse_func again. (#153107, Robert Ögren) + Sun Sep 19 23:52:35 2004 Matthias Clasen * glib/gmessages.c (mklevel_prefix): diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 320ed79b..50b49640 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +Sun Sep 19 23:56:15 2004 Matthias Clasen + + * glib/goption.c (g_option_context_parse): Call error_func + on error, not post_parse_func again. (#153107, Robert Ögren) + Sun Sep 19 23:52:35 2004 Matthias Clasen * glib/gmessages.c (mklevel_prefix): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 320ed79b..50b49640 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Sun Sep 19 23:56:15 2004 Matthias Clasen + + * glib/goption.c (g_option_context_parse): Call error_func + on error, not post_parse_func again. (#153107, Robert Ögren) + Sun Sep 19 23:52:35 2004 Matthias Clasen * glib/gmessages.c (mklevel_prefix): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 320ed79b..50b49640 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Sun Sep 19 23:56:15 2004 Matthias Clasen + + * glib/goption.c (g_option_context_parse): Call error_func + on error, not post_parse_func again. (#153107, Robert Ögren) + Sun Sep 19 23:52:35 2004 Matthias Clasen * glib/gmessages.c (mklevel_prefix): diff --git a/glib/goption.c b/glib/goption.c index ea9ce086..a2738a7a 100644 --- a/glib/goption.c +++ b/glib/goption.c @@ -1083,8 +1083,8 @@ g_option_context_parse (GOptionContext *context, GOptionGroup *group = list->data; if (group->error_func) - (* group->post_parse_func) (context, group, - group->user_data, error); + (* group->error_func) (context, group, + group->user_data, error); list = list->next; } -- 2.34.1