From 1fa8e404a4fd9fc723b0a00be09c3c9fce0cfff3 Mon Sep 17 00:00:00 2001
From: "John (J5) Palmieri" <johnp@redhat.com>
Date: Tue, 8 Aug 2006 22:43:40 +0000
Subject: * dbus/dbus-object-tree.c (_dbus_object_subtree_new):   remove dead
 code

---
 ChangeLog               | 12 +++++++++++-
 dbus/dbus-object-tree.c |  5 -----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fd4e7fe1..7436ae1c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-08-08  John (J5) Palmieri  <johnp@redhat.com>
+
+	* dbus/dbus-object-tree.c (_dbus_object_subtree_new):
+	remove dead code
+
+2006-08-08  John (J5) Palmieri  <johnp@redhat.com>
+
+	* tools/run-with-tmp-session-bus.sh: use #!/bin/sh instead of
+	#!/bin/bash
+
 2006-08-08  John (J5) Palmieri  <johnp@redhat.com>
 
 	* Doxyfile.in: fix the INPUT line so we can generate docs 
@@ -36,7 +46,7 @@
 	* bus/Makefile.am (install-data-hook): removed the slash after 
 	$(DESTDIR) so we don't get the double slash which does not work
 	in windows (patch from Andras Porjesz 
-	<andras dot porjesz at siemens dot com>
+	<andras dot porjesz at siemens dot com>)
 
 2006-08-08  John (J5) Palmieri  <johnp@redhat.com>
 
diff --git a/dbus/dbus-object-tree.c b/dbus/dbus-object-tree.c
index 27dc5f17..ec83498b 100644
--- a/dbus/dbus-object-tree.c
+++ b/dbus/dbus-object-tree.c
@@ -981,11 +981,6 @@ _dbus_object_subtree_new (const char                  *name,
   return subtree;
 
  oom:
-  if (subtree)
-    {
-      dbus_free (subtree);
-    }
-
   return NULL;
 }
 
-- 
cgit