don't free the module name until after we load the module

2001-11-04  jacob berkman  <jacob@ximian.com>

	* gtk/gtkmain.c (find_module): don't free the module name until
	after we load the module

diff --git a/ChangeLog b/ChangeLog
index 42fd8e92f91c73218ede74c63dddf7a3c0148fbe..ec47b7bbb40d37e82e69ec4d239db62f3f68abcb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-04  jacob berkman  <jacob@ximian.com>
+
+       * 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  <otaylor@redhat.com>
  
        * gtk/gtkctree.c: Convert GTK_TYPE_CTREE_NODE to pointer

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 42fd8e92f91c73218ede74c63dddf7a3c0148fbe..ec47b7bbb40d37e82e69ec4d239db62f3f68abcb 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+2001-11-04  jacob berkman  <jacob@ximian.com>
+
+       * 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  <otaylor@redhat.com>
  
        * gtk/gtkctree.c: Convert GTK_TYPE_CTREE_NODE to pointer

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 42fd8e92f91c73218ede74c63dddf7a3c0148fbe..ec47b7bbb40d37e82e69ec4d239db62f3f68abcb 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2001-11-04  jacob berkman  <jacob@ximian.com>
+
+       * 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  <otaylor@redhat.com>
  
        * gtk/gtkctree.c: Convert GTK_TYPE_CTREE_NODE to pointer

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 42fd8e92f91c73218ede74c63dddf7a3c0148fbe..ec47b7bbb40d37e82e69ec4d239db62f3f68abcb 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2001-11-04  jacob berkman  <jacob@ximian.com>
+
+       * 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  <otaylor@redhat.com>
  
        * gtk/gtkctree.c: Convert GTK_TYPE_CTREE_NODE to pointer

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 42fd8e92f91c73218ede74c63dddf7a3c0148fbe..ec47b7bbb40d37e82e69ec4d239db62f3f68abcb 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2001-11-04  jacob berkman  <jacob@ximian.com>
+
+       * 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  <otaylor@redhat.com>
  
        * gtk/gtkctree.c: Convert GTK_TYPE_CTREE_NODE to pointer

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 42fd8e92f91c73218ede74c63dddf7a3c0148fbe..ec47b7bbb40d37e82e69ec4d239db62f3f68abcb 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2001-11-04  jacob berkman  <jacob@ximian.com>
+
+       * 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  <otaylor@redhat.com>
  
        * gtk/gtkctree.c: Convert GTK_TYPE_CTREE_NODE to pointer

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 42fd8e92f91c73218ede74c63dddf7a3c0148fbe..ec47b7bbb40d37e82e69ec4d239db62f3f68abcb 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2001-11-04  jacob berkman  <jacob@ximian.com>
+
+       * 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  <otaylor@redhat.com>
  
        * gtk/gtkctree.c: Convert GTK_TYPE_CTREE_NODE to pointer

diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 4cddf5a48adcd7ca708524a90752dbe80bb2483b..9e84e03accdcb9f013b922f7aa5b3b39e1a7cf2d 100644 (file)
--- 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);