Call error_func on error, not post_parse_func again. (#153107, Robert

Sun Sep 19 23:56:15 2004  Matthias Clasen  <maclas@gmx.de>

	* glib/goption.c (g_option_context_parse): Call error_func
	on error, not post_parse_func again.  (#153107, Robert Ögren)

diff --git a/ChangeLog b/ChangeLog
index 320ed79..50b4964 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Sep 19 23:56:15 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * 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  <maclas@gmx.de>
 
        * glib/gmessages.c (mklevel_prefix): 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 320ed79..50b4964 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Sun Sep 19 23:56:15 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * 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  <maclas@gmx.de>
 
        * glib/gmessages.c (mklevel_prefix): 

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 320ed79..50b4964 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+Sun Sep 19 23:56:15 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * 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  <maclas@gmx.de>
 
        * glib/gmessages.c (mklevel_prefix): 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 320ed79..50b4964 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Sun Sep 19 23:56:15 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * 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  <maclas@gmx.de>
 
        * glib/gmessages.c (mklevel_prefix): 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 320ed79..50b4964 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Sun Sep 19 23:56:15 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * 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  <maclas@gmx.de>
 
        * glib/gmessages.c (mklevel_prefix): 

diff --git a/glib/goption.c b/glib/goption.c
index ea9ce08..a2738a7 100644 (file)
--- 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;
     }