[ekiga] Opal::Presentity: Removed circular dependancy.
- From: Damien Sandras <dsandras src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ekiga] Opal::Presentity: Removed circular dependancy.
- Date: Thu, 12 Nov 2015 18:35:27 +0000 (UTC)
commit 80a21e397d441850e2db2b5f99494bc72ef960a9
Author: Damien Sandras <dsandras seconix com>
Date: Sun Oct 4 12:54:27 2015 +0200
Opal::Presentity: Removed circular dependancy.
Circular dependancies is something we need to avoid. This is the purpose
of this branch. However, it did not prevent me from adding a new
circular dependancy yesterday by binding a signal with a shared_ptr to
myself as argument.
This is now fixed.
lib/engine/components/opal/opal-presentity.cpp | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/lib/engine/components/opal/opal-presentity.cpp b/lib/engine/components/opal/opal-presentity.cpp
index 5d55bc3..e4adcb2 100644
--- a/lib/engine/components/opal/opal-presentity.cpp
+++ b/lib/engine/components/opal/opal-presentity.cpp
@@ -129,7 +129,7 @@ Opal::Presentity::Presentity (const Opal::Account & account_,
Opal::Presentity::~Presentity ()
{
#if DEBUG
- std::cout << "Opal::Presentity: Destructor invoked" << std::endl;
+ std::cout << __FUNCTION__ << " invoked in " << __FILE__ << std::endl;
#endif
}
@@ -148,8 +148,7 @@ Opal::Presentity::add_actions ()
boost::bind (&Opal::Presentity::remove, this))));
add_action (Ekiga::ActionPtr (new Ekiga::Action ("rename", _("Rename _Groups"),
boost::bind (&Opal::Account::on_rename_group,
- (Opal::Account *) &account,
- this->shared_from_this ()))));
+ (Opal::Account *) &account, get_groups
()))));
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]