diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 6 | ||||
| -rw-r--r-- | gdk/gdk.c | 7 | ||||
| -rw-r--r-- | gtk/gtkmain.c | 8 |
4 files changed, 25 insertions, 2 deletions
@@ -1,3 +1,9 @@ +2005-12-06 Matthias Clasen <mclasen@redhat.com> + + * gdk/gdk.c (gdk_parse_args): + * gtk/gtkmain.c (gtk_parse_args): Don't ignore errors + from g_option_context_parse(). + Tue Dec 6 11:37:59 2005 Tim Janik <timj@gtk.org> * gdk/gdkevents.c (gdk_event_new): fix missing hash table diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 71cd1bf033..9ebbb776f8 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2005-12-06 Matthias Clasen <mclasen@redhat.com> + + * gdk/gdk.c (gdk_parse_args): + * gtk/gtkmain.c (gtk_parse_args): Don't ignore errors + from g_option_context_parse(). + Tue Dec 6 11:37:59 2005 Tim Janik <timj@gtk.org> * gdk/gdkevents.c (gdk_event_new): fix missing hash table @@ -201,6 +201,7 @@ gdk_parse_args (int *argc, { GOptionContext *option_context; GOptionGroup *option_group; + GError *error = NULL; if (gdk_initialized) return; @@ -216,7 +217,11 @@ gdk_parse_args (int *argc, g_option_group_add_entries (option_group, gdk_args); g_option_group_add_entries (option_group, _gdk_windowing_args); - g_option_context_parse (option_context, argc, argv, NULL); + if (g_option_context_parse (option_context, argc, argv, &error)) + { + g_warning ("%s", error->message); + g_error_free (error); + } g_option_context_free (option_context); GDK_NOTE (MISC, g_message ("progname: \"%s\"", g_get_prgname ())); diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index 3f9f54d98d..ecc35906f6 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -673,6 +673,7 @@ gtk_parse_args (int *argc, { GOptionContext *option_context; GOptionGroup *gtk_group; + GError *error = NULL; if (gtk_initialized) return TRUE; @@ -687,7 +688,12 @@ gtk_parse_args (int *argc, g_option_context_set_help_enabled (option_context, FALSE); gtk_group = gtk_get_option_group (FALSE); g_option_context_set_main_group (option_context, gtk_group); - g_option_context_parse (option_context, argc, argv, NULL); + if (!g_option_context_parse (option_context, argc, argv, &error)) + { + g_warning ("%s", error->message); + g_error_free (error); + } + g_option_context_free (option_context); return TRUE; |