[gtk+] Make the gail blacklisting more quiet
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Make the gail blacklisting more quiet
- Date: Mon, 5 Sep 2011 15:57:28 +0000 (UTC)
commit a51a31466dcaa6f9ae5915acb1ea7aa0f2407024
Author: Matthias Clasen <mclasen redhat com>
Date: Mon Sep 5 11:44:47 2011 -0400
Make the gail blacklisting more quiet
Don't mention blacklisted modules at all if they are not found.
gtk/gtkmodules.c | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
---
diff --git a/gtk/gtkmodules.c b/gtk/gtkmodules.c
index 5776525..d4135f0 100644
--- a/gtk/gtkmodules.c
+++ b/gtk/gtkmodules.c
@@ -259,11 +259,14 @@ cmp_module (GtkModuleInfo *info,
}
static gboolean
-module_is_blacklisted (const gchar *name)
+module_is_blacklisted (const gchar *name,
+ gboolean verbose)
{
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;
}
@@ -303,7 +306,7 @@ load_module (GSList *module_list,
{
/* Do the check this late so we only warn about existing modules,
* not old modules that are still in the modules path. */
- if (module_is_blacklisted (name))
+ if (module_is_blacklisted (name, TRUE))
{
modinit_func = NULL;
success = TRUE;
@@ -383,10 +386,13 @@ load_module (GSList *module_list,
}
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",
- name, error ? ": " : "", error ? error : "");
+ g_message ("Failed to load module \"%s\"%s%s",
+ name, error ? ": " : "", error ? error : "");
+ }
}
return module_list;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]