callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't ignore errors from g_option_context_parse().

Browse Source 
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().
This commit is contained in:
Matthias Clasen
2005-12-06 16:44:31 +00:00
committed by Matthias Clasen
parent 83344dae85
commit 73696ef8be
4 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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> Tue Dec 6 11:37:59 2005 Tim Janik <timj@gtk.org>
* gdk/gdkevents.c (gdk_event_new): fix missing hash table * gdk/gdkevents.c (gdk_event_new): fix missing hash table

6
ChangeLog.pre-2-10
View File

@ -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> Tue Dec 6 11:37:59 2005 Tim Janik <timj@gtk.org>
* gdk/gdkevents.c (gdk_event_new): fix missing hash table * gdk/gdkevents.c (gdk_event_new): fix missing hash table

7
gdk/gdk.c
View File

@ -201,6 +201,7 @@ gdk_parse_args (int *argc,
{ {
GOptionContext *option_context; GOptionContext *option_context;
GOptionGroup *option_group; GOptionGroup *option_group;
GError *error = NULL;
if (gdk_initialized) if (gdk_initialized)
return; 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_args);
g_option_group_add_entries (option_group, _gdk_windowing_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); g_option_context_free (option_context);
GDK_NOTE (MISC, g_message ("progname: \"%s\"", g_get_prgname ())); GDK_NOTE (MISC, g_message ("progname: \"%s\"", g_get_prgname ()));

8
gtk/gtkmain.c
View File

@ -673,6 +673,7 @@ gtk_parse_args (int *argc,
{ {
GOptionContext *option_context; GOptionContext *option_context;
GOptionGroup *gtk_group; GOptionGroup *gtk_group;
GError *error = NULL;
if (gtk_initialized) if (gtk_initialized)
return TRUE; return TRUE;
@ -687,7 +688,12 @@ gtk_parse_args (int *argc,
g_option_context_set_help_enabled (option_context, FALSE); g_option_context_set_help_enabled (option_context, FALSE);
gtk_group = gtk_get_option_group (FALSE); gtk_group = gtk_get_option_group (FALSE);
g_option_context_set_main_group (option_context, gtk_group); 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); g_option_context_free (option_context);
return TRUE; return TRUE;