--- a/src/core/object-base.cc	Mon Mar 24 13:11:48 2008 -0700
+++ b/src/core/object-base.cc	Mon Mar 24 13:15:53 2008 -0700
@@ -1,3 +1,22 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2008 INRIA
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Authors: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
+ */
 #include "object-base.h"
 #include "log.h"
 #include "trace-source-accessor.h"
@@ -254,7 +273,7 @@
   return ok;
 }
 bool 
-ObjectBase::TraceConnectWithoutContext (std::string name, std::string context, const CallbackBase &cb)
+ObjectBase::TraceConnect (std::string name, std::string context, const CallbackBase &cb)
 {
   TypeId tid = GetInstanceTypeId ();
   Ptr<const TraceSourceAccessor> accessor = tid.LookupTraceSourceByName (name);
@@ -278,7 +297,7 @@
   return ok;
 }
 bool 
-ObjectBase::TraceDisconnectWithoutContext (std::string name, std::string context, const CallbackBase &cb)
+ObjectBase::TraceDisconnect (std::string name, std::string context, const CallbackBase &cb)
 {
   TypeId tid = GetInstanceTypeId ();
   Ptr<const TraceSourceAccessor> accessor = tid.LookupTraceSourceByName (name);