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

Merge branch 'gtk-debug-warn-when-built-without-debug' into 'gtk-3-24'

Browse Source 
Print a warning if GTK_DEBUG is set but gtk isn't built with G_ENABLE_DEBUG

See merge request GNOME/gtk!1109
This commit is contained in:
Matthias Clasen 2019-10-01 14:54:19 +00:00
commit 14922f1784
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk/gtkmain.c
View File

@ -657,16 +657,18 @@ do_pre_parse_initialization (int *argc,
GDK_PRIVATE_CALL (gdk_pre_parse) (); GDK_PRIVATE_CALL (gdk_pre_parse) ();
gdk_event_handler_set ((GdkEventFunc)gtk_main_do_event, NULL, NULL); gdk_event_handler_set ((GdkEventFunc)gtk_main_do_event, NULL, NULL);
#ifdef G_ENABLE_DEBUG
env_string = g_getenv ("GTK_DEBUG"); env_string = g_getenv ("GTK_DEBUG");
if (env_string != NULL) if (env_string != NULL)
{ {
#ifdef G_ENABLE_DEBUG
debug_flags[0].flags = g_parse_debug_string (env_string, debug_flags[0].flags = g_parse_debug_string (env_string,
gtk_debug_keys, gtk_debug_keys,
G_N_ELEMENTS (gtk_debug_keys)); G_N_ELEMENTS (gtk_debug_keys));
#else
g_warning ("GTK_DEBUG set but ignored because gtk isn't built with G_ENABLE_DEBUG");
#endif /* G_ENABLE_DEBUG */
env_string = NULL; env_string = NULL;
} }
#endif /* G_ENABLE_DEBUG */
env_string = g_getenv ("GTK3_MODULES"); env_string = g_getenv ("GTK3_MODULES");
if (env_string) if (env_string)