AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Make --g-fatal-warnings a G_OPTION_ARG_NONE, since it doesn't take an

Browse Source 
2004-09-29  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkmain.c: Make --g-fatal-warnings a G_OPTION_ARG_NONE,
	since it doesn't take an argument.
This commit is contained in:
Matthias Clasen 2004-09-29 22:29:21 +00:00 committed by Matthias Clasen
parent 48252de345
commit 63110fc53d
5 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2004-09-29 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkmain.c: Make --g-fatal-warnings a G_OPTION_ARG_NONE,
since it doesn't take an argument.
2004-09-29 Christopher Blizzard <blizzard@redhat.com>
* gtk/gtkmenutoolbutton.h: Remove trailing semicolon on

5
ChangeLog.pre-2-10
View File

@ -1,3 +1,8 @@
2004-09-29 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkmain.c: Make --g-fatal-warnings a G_OPTION_ARG_NONE,
since it doesn't take an argument.
2004-09-29 Christopher Blizzard <blizzard@redhat.com>
* gtk/gtkmenutoolbutton.h: Remove trailing semicolon on

5
ChangeLog.pre-2-6
View File

@ -1,3 +1,8 @@
2004-09-29 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkmain.c: Make --g-fatal-warnings a G_OPTION_ARG_NONE,
since it doesn't take an argument.
2004-09-29 Christopher Blizzard <blizzard@redhat.com>
* gtk/gtkmenutoolbutton.h: Remove trailing semicolon on

5
ChangeLog.pre-2-8
View File

@ -1,3 +1,8 @@
2004-09-29 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkmain.c: Make --g-fatal-warnings a G_OPTION_ARG_NONE,
since it doesn't take an argument.
2004-09-29 Christopher Blizzard <blizzard@redhat.com>
* gtk/gtkmenutoolbutton.h: Remove trailing semicolon on

24
gtk/gtkmain.c
View File

@ -350,6 +350,7 @@ gtk_disable_setlocale (void)
#endif
static GString *gtk_modules_string = NULL;
static gboolean g_fatal_warnings = FALSE;
#ifdef G_ENABLE_DEBUG
static gboolean
@ -389,23 +390,11 @@ gtk_arg_module_cb (const char *key, const char *value, gpointer user_data)
return TRUE;
}
static gboolean
gtk_arg_warnings_cb (const char *key, const char *value, gpointer user_data)
{
GLogLevelFlags fatal_mask;
fatal_mask = g_log_set_always_fatal (G_LOG_FATAL_MASK);
fatal_mask |= G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL;
g_log_set_always_fatal (fatal_mask);
return TRUE;
}
static GOptionEntry gtk_args[] = {
{ "gtk-module", 0, 0, G_OPTION_ARG_CALLBACK, gtk_arg_module_cb,
/* Description of --gtk-module=MODULES in --help output */ N_("Load additional GTK+ modules"),
/* Placeholder in --gtk-module=MODULES in --help output */ N_("MODULES") },
{ "g-fatal-warnings", 0, 0, G_OPTION_ARG_CALLBACK, gtk_arg_warnings_cb,
{ "g-fatal-warnings", 0, 0, G_OPTION_ARG_NONE, &g_fatal_warnings,
/* Description of --g-fatal-warnings in --help output */ N_("Make all warnings fatal"), NULL },
#ifdef G_ENABLE_DEBUG
{ "gtk-debug", 0, 0, G_OPTION_ARG_CALLBACK, gtk_arg_debug_cb,
@ -460,6 +449,15 @@ static void
do_post_parse_initialization (int *argc,
char ***argv)
{
if (g_fatal_warnings)
{
GLogLevelFlags fatal_mask;
fatal_mask = g_log_set_always_fatal (G_LOG_FATAL_MASK);
fatal_mask |= G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL;
g_log_set_always_fatal (fatal_mask);
}
if (gtk_debug_flags & GTK_DEBUG_UPDATES)
gdk_window_set_debug_updates (TRUE);