[gtk+] modules: Blacklist gail
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] modules: Blacklist gail
- Date: Wed, 6 Jul 2011 14:50:49 +0000 (UTC)
commit 768b192ddb3b77775def56ba755a667204b4b3e8
Author: Benjamin Otte <otte redhat com>
Date: Tue Jul 5 22:33:22 2011 +0200
modules: Blacklist gail
And print a message when somebody has it enabled that indicates that
something is wrong but doesn't sound too scary.
gtk/gtkmodules.c | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/gtk/gtkmodules.c b/gtk/gtkmodules.c
index 5fa2abf..5776525 100644
--- a/gtk/gtkmodules.c
+++ b/gtk/gtkmodules.c
@@ -258,6 +258,18 @@ cmp_module (GtkModuleInfo *info,
return info->module != module;
}
+static gboolean
+module_is_blacklisted (const gchar *name)
+{
+ 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.");
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
static GSList *
load_module (GSList *module_list,
const gchar *name)
@@ -289,7 +301,14 @@ load_module (GSList *module_list,
if (module)
{
- if (g_module_symbol (module, "gtk_module_init", &modinit_func_ptr))
+ /* 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))
+ {
+ modinit_func = NULL;
+ success = TRUE;
+ }
+ else if (g_module_symbol (module, "gtk_module_init", &modinit_func_ptr))
modinit_func = modinit_func_ptr;
else
modinit_func = NULL;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]