diff --git a/ChangeLog b/ChangeLog index 0826a7c03..6f315a6e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Mon Sep 20 00:17:37 2004 Matthias Clasen + + * tests/option-test.c (error_test3_post_parse): + * tests/option-test.c (error_test2_post_parse): + * tests/option-test.c (error_test1_post_parse): Don't call + g_set_error () with a NULL format. (#153103, Robert Ögren) + Mon Sep 20 00:13:48 2004 Matthias Clasen Make GOption remove long options completely. (#153113, Robert Ögren) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 0826a7c03..6f315a6e5 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Mon Sep 20 00:17:37 2004 Matthias Clasen + + * tests/option-test.c (error_test3_post_parse): + * tests/option-test.c (error_test2_post_parse): + * tests/option-test.c (error_test1_post_parse): Don't call + g_set_error () with a NULL format. (#153103, Robert Ögren) + Mon Sep 20 00:13:48 2004 Matthias Clasen Make GOption remove long options completely. (#153113, Robert Ögren) diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 0826a7c03..6f315a6e5 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,10 @@ +Mon Sep 20 00:17:37 2004 Matthias Clasen + + * tests/option-test.c (error_test3_post_parse): + * tests/option-test.c (error_test2_post_parse): + * tests/option-test.c (error_test1_post_parse): Don't call + g_set_error () with a NULL format. (#153103, Robert Ögren) + Mon Sep 20 00:13:48 2004 Matthias Clasen Make GOption remove long options completely. (#153113, Robert Ögren) diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 0826a7c03..6f315a6e5 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Mon Sep 20 00:17:37 2004 Matthias Clasen + + * tests/option-test.c (error_test3_post_parse): + * tests/option-test.c (error_test2_post_parse): + * tests/option-test.c (error_test1_post_parse): Don't call + g_set_error () with a NULL format. (#153103, Robert Ögren) + Mon Sep 20 00:13:48 2004 Matthias Clasen Make GOption remove long options completely. (#153113, Robert Ögren) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 0826a7c03..6f315a6e5 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Mon Sep 20 00:17:37 2004 Matthias Clasen + + * tests/option-test.c (error_test3_post_parse): + * tests/option-test.c (error_test2_post_parse): + * tests/option-test.c (error_test1_post_parse): Don't call + g_set_error () with a NULL format. (#153103, Robert Ögren) + Mon Sep 20 00:13:48 2004 Matthias Clasen Make GOption remove long options completely. (#153113, Robert Ögren) diff --git a/tests/option-test.c b/tests/option-test.c index 39d6688bb..08a4f92cd 100644 --- a/tests/option-test.c +++ b/tests/option-test.c @@ -78,7 +78,7 @@ error_test1_post_parse (GOptionContext *context, g_assert (error_test1_int == 20); /* Set an error in the post hook */ - g_set_error (error, G_OPTION_ERROR, G_OPTION_ERROR_BAD_VALUE, NULL); + g_set_error (error, G_OPTION_ERROR, G_OPTION_ERROR_BAD_VALUE, ""); return FALSE; } @@ -138,7 +138,7 @@ error_test2_post_parse (GOptionContext *context, g_assert (strcmp (error_test2_string, "bar") == 0); /* Set an error in the post hook */ - g_set_error (error, G_OPTION_ERROR, G_OPTION_ERROR_BAD_VALUE, NULL); + g_set_error (error, G_OPTION_ERROR, G_OPTION_ERROR_BAD_VALUE, ""); return FALSE; } @@ -197,7 +197,7 @@ error_test3_post_parse (GOptionContext *context, g_assert (error_test3_boolean); /* Set an error in the post hook */ - g_set_error (error, G_OPTION_ERROR, G_OPTION_ERROR_BAD_VALUE, NULL); + g_set_error (error, G_OPTION_ERROR, G_OPTION_ERROR_BAD_VALUE, ""); return FALSE; }