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

Make the gail blacklisting more quiet

Browse Source 
Don't mention blacklisted modules at all if they are not found.
This commit is contained in:
Matthias Clasen 2011-09-05 11:44:47 -04:00
parent 1bede5c3fb
commit a51a31466d
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gtk/gtkmodules.c
View File

@ -259,11 +259,14 @@ cmp_module (GtkModuleInfo *info,
} }
static gboolean static gboolean
module_is_blacklisted (const gchar *name) module_is_blacklisted (const gchar *name,
gboolean verbose)
{ {
if (g_str_equal (name, "gail")) if (g_str_equal (name, "gail"))
{ {
g_message ("Not loading module \"gail\": The functionality is provided by GTK natively. Please try to not load it."); if (verbose)
g_message ("Not loading module \"gail\": The functionality is provided by GTK natively. Please try to not load it.");
return TRUE; return TRUE;
} }
@ -303,7 +306,7 @@ load_module (GSList *module_list,
{ {
/* Do the check this late so we only warn about existing modules, /* Do the check this late so we only warn about existing modules,
* not old modules that are still in the modules path. */ * not old modules that are still in the modules path. */
if (module_is_blacklisted (name)) if (module_is_blacklisted (name, TRUE))
{ {
modinit_func = NULL; modinit_func = NULL;
success = TRUE; success = TRUE;
@ -383,10 +386,13 @@ load_module (GSList *module_list,
} }
else else
{ {
const gchar *error = g_module_error (); if (!module_is_blacklisted (name, FALSE))
{
const gchar *error = g_module_error ();
g_message ("Failed to load module \"%s\"%s%s", g_message ("Failed to load module \"%s\"%s%s",
name, error ? ": " : "", error ? error : ""); name, error ? ": " : "", error ? error : "");
}
} }
return module_list; return module_list;