1.1 --- a/src/core/config.h	Mon Mar 10 14:52:08 2008 -0700
     1.2 +++ b/src/core/config.h	Tue Mar 11 13:46:22 2008 -0700
     1.3 @@ -78,14 +78,14 @@
     1.4   * match the input path and will then connect the input callback
     1.5   * to them.
     1.6   */
     1.7 -void Connect (std::string path, const CallbackBase &cb);
     1.8 +void ConnectWithoutContext (std::string path, const CallbackBase &cb);
     1.9  /**
    1.10   * \param path a path to match trace sources.
    1.11   * \param cb the callback to disconnect to the matching trace sources.
    1.12   *
    1.13   * This function undoes the work of Config::Connect.
    1.14   */
    1.15 -void Disconnect (std::string path, const CallbackBase &cb);
    1.16 +void DisconnectWithoutContext (std::string path, const CallbackBase &cb);
    1.17  /**
    1.18   * \param path a path to match trace sources.
    1.19   * \param cb the callback to connect to the matching trace sources.
    1.20 @@ -95,14 +95,14 @@
    1.21   * to them in such a way that the callback will receive an extra
    1.22   * context string upon trace event notification.
    1.23   */
    1.24 -void ConnectWithContext (std::string path, const CallbackBase &cb);
    1.25 +void Connect (std::string path, const CallbackBase &cb);
    1.26  /**
    1.27   * \param path a path to match trace sources.
    1.28   * \param cb the callback to connect to the matching trace sources.
    1.29   *
    1.30   * This function undoes the work of Config::ConnectWithContext.
    1.31   */
    1.32 -void DisconnectWithContext (std::string path, const CallbackBase &cb);
    1.33 +void Disconnect (std::string path, const CallbackBase &cb);
    1.34  
    1.35  /**
    1.36   * \param obj a new root object