From bc5849a5e0d3c30a781cd433691bf3caef989c12 Mon Sep 17 00:00:00 2001 From: jacob berkman Date: Sun, 4 Nov 2001 20:14:41 +0000 Subject: [PATCH] don't free the module name until after we load the module 2001-11-04 jacob berkman * gtk/gtkmain.c (find_module): don't free the module name until after we load the module --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkmain.c | 3 ++- 8 files changed, 37 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 42fd8e92f9..ec47b7bbb4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-11-04 jacob berkman + + * gtk/gtkmain.c (find_module): don't free the module name until + after we load the module + Sat Nov 3 13:57:21 2001 Owen Taylor * gtk/gtkctree.c: Convert GTK_TYPE_CTREE_NODE to pointer diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 42fd8e92f9..ec47b7bbb4 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +2001-11-04 jacob berkman + + * gtk/gtkmain.c (find_module): don't free the module name until + after we load the module + Sat Nov 3 13:57:21 2001 Owen Taylor * gtk/gtkctree.c: Convert GTK_TYPE_CTREE_NODE to pointer diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 42fd8e92f9..ec47b7bbb4 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2001-11-04 jacob berkman + + * gtk/gtkmain.c (find_module): don't free the module name until + after we load the module + Sat Nov 3 13:57:21 2001 Owen Taylor * gtk/gtkctree.c: Convert GTK_TYPE_CTREE_NODE to pointer diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 42fd8e92f9..ec47b7bbb4 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +2001-11-04 jacob berkman + + * gtk/gtkmain.c (find_module): don't free the module name until + after we load the module + Sat Nov 3 13:57:21 2001 Owen Taylor * gtk/gtkctree.c: Convert GTK_TYPE_CTREE_NODE to pointer diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 42fd8e92f9..ec47b7bbb4 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2001-11-04 jacob berkman + + * gtk/gtkmain.c (find_module): don't free the module name until + after we load the module + Sat Nov 3 13:57:21 2001 Owen Taylor * gtk/gtkctree.c: Convert GTK_TYPE_CTREE_NODE to pointer diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 42fd8e92f9..ec47b7bbb4 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2001-11-04 jacob berkman + + * gtk/gtkmain.c (find_module): don't free the module name until + after we load the module + Sat Nov 3 13:57:21 2001 Owen Taylor * gtk/gtkctree.c: Convert GTK_TYPE_CTREE_NODE to pointer diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 42fd8e92f9..ec47b7bbb4 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2001-11-04 jacob berkman + + * gtk/gtkmain.c (find_module): don't free the module name until + after we load the module + Sat Nov 3 13:57:21 2001 Owen Taylor * gtk/gtkctree.c: Convert GTK_TYPE_CTREE_NODE to pointer diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index 4cddf5a48a..9e84e03acc 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -327,8 +327,9 @@ find_module (gchar **module_path, if (g_file_test (module_name, G_FILE_TEST_EXISTS)) { + module = g_module_open (module_name, G_MODULE_BIND_LAZY); g_free (module_name); - return g_module_open (module_name, G_MODULE_BIND_LAZY); + return module; } g_free (module_name);