* dbus/dbus-object-tree.c (_dbus_object_subtree_new):

  remove dead code

diff --git a/ChangeLog b/ChangeLog
index fd4e7fe1c3deb453f2aa9db859d38f73b84cb81e..7436ae1ce39909c91499a805fc85e88707ecc780 100644 (file)
--- 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 27dc5f17ab69d574c968019d102008720d61a653..ec83498b2e41a127ff43a4ddfc2cfd876a7542e9 100644 (file)
--- 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;
 }