Merge fix for bug #143941 from HEAD. And remove a stray semicolon in the

2004-06-09  Kjartan Maraas  <kmaraas@gnome.org>

	* gconf/gconf-internals.c: (gconf_activate_server):
	Merge fix for bug #143941 from HEAD. And remove a stray
	semicolon in the process.

2 files changed, 7 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index ad2f8296..ab461aba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-06-09  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* gconf/gconf-internals.c: (gconf_activate_server):
+	Merge fix for bug #143941 from HEAD. And remove a stray
+	semicolon in the process.
+
 2004-04-23  Mark McLoughlin  <mark@skynet.ie>
 
 	* gconf/gconf-sources.c: (gconf_sources_new_from_addresses): return
diff --git a/gconf/gconf-internals.c b/gconf/gconf-internals.c
index f6778fc4..fae31e11 100644
--- a/gconf/gconf-internals.c
+++ b/gconf/gconf-internals.c
@@ -2839,7 +2839,6 @@ gconf_activate_server (gboolean  start_if_not_found,
                        GError  **error)
 {
   ConfigServer server = CORBA_OBJECT_NIL;
-;
   int p[2] = { -1, -1 };
   char buf[1];
   GError *tmp_err;
@@ -2892,6 +2891,7 @@ gconf_activate_server (gboolean  start_if_not_found,
       if (server != CORBA_OBJECT_NIL)
 	{
 	  g_string_free (failure_log, TRUE);
+	  g_free (gconfd_dir);
 	  return server;
 	}
     }