[gtk+] Fix module blacklisting
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Fix module blacklisting
- Date: Fri, 23 Sep 2011 20:43:23 +0000 (UTC)
commit dd82b3043303d6635d19dda85092d3affcdae36a
Author: Matthias Clasen <mclasen redhat com>
Date: Fri Sep 23 16:25:33 2011 -0400
Fix module blacklisting
The handling of the module lists is a bit confusing here. There is
a global list that is populated with initial modules from GTK_MODULES,
and then there is a second list that is suppposed to hold the modules
loaded from the gtk-modules xsetting, which we attach to the GtkSettings
object. The blacklisting caused us to put the wrong modules into the
second list, and mess up the module refcounts, eventually double-freeing
memory when the setting changes repeatedly.
https://bugzilla.gnome.org/show_bug.cgi?id=659966
gtk/gtkmodules.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
---
diff --git a/gtk/gtkmodules.c b/gtk/gtkmodules.c
index 3a8dac3..e237fa7 100644
--- a/gtk/gtkmodules.c
+++ b/gtk/gtkmodules.c
@@ -295,7 +295,9 @@ load_module (GSList *module_list,
info->ref_count++;
success = TRUE;
+ break;
}
+ info = NULL;
}
if (!success)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]