[ekiga/ds-gtk-application] CallCore: Another change to transfer/call actions.

[Damien Sandras <dsandras src gnome org>]

commit 7d37059f6ec862264aedb8e49b1478111644b237
Author: Damien Sandras <dsandras beip be>
Date:   Sat Mar 22 11:35:38 2014 +0100

    CallCore: Another change to transfer/call actions.
    
    I'm not sure yet if transfer should appear dynamically or greyed out.

 lib/engine/protocol/call-core.cpp |   22 ++++++----------------
 1 files changed, 6 insertions(+), 16 deletions(-)
---
diff --git a/lib/engine/protocol/call-core.cpp b/lib/engine/protocol/call-core.cpp
index 1221ba6..2095a05 100644
--- a/lib/engine/protocol/call-core.cpp
+++ b/lib/engine/protocol/call-core.cpp
@@ -160,6 +160,12 @@ void CallCore::register_actions (boost::shared_ptr<ContactCore> _contact_core)
                                                               this, _2))));
 
   contact_core->add_action (ActionPtr (
+                              new ContactAction ("transfer", _("Transfer"),
+                                                 boost::bind (&CallCore::transfer,
+                                                              this, _2, false),
+                                                 boost::bind (&CallCore::is_supported_uri,
+                                                              this, _2))));
+  contact_core->add_action (ActionPtr (
                               new ContactAction ("message", _("Message"),
                                                  boost::bind (&CallCore::message,
                                                               this, _1, _2),
@@ -170,7 +176,6 @@ void CallCore::register_actions (boost::shared_ptr<ContactCore> _contact_core)
 
 void CallCore::add_call (boost::shared_ptr<Call> call, boost::shared_ptr<CallManager> manager)
 {
-  contact_core->remove_action ("call");
   boost::shared_ptr<Ekiga::scoped_connections> conns(new Ekiga::scoped_connections);
 
   conns->add (call->ringing.connect (boost::bind (&CallCore::on_ringing_call, this,
@@ -198,27 +203,12 @@ void CallCore::add_call (boost::shared_ptr<Call> call, boost::shared_ptr<CallMan
   conns->add (call->removed.connect (boost::bind (&CallCore::on_call_removed, this, call)));
 
   call_connections [call->get_id ()] = conns;
-  contact_core->add_action (ActionPtr (
-                              new ContactAction ("transfer", _("Transfer"),
-                                                 boost::bind (&CallCore::transfer,
-                                                              this, _2, false),
-                                                 boost::bind (&CallCore::is_supported_uri,
-                                                              this, _2))));
 }
 
 
 void CallCore::remove_call (boost::shared_ptr<Call> call)
 {
-  contact_core->remove_action ("transfer");
-
   call_connections.erase (call->get_id ());
-
-  contact_core->add_action (ActionPtr (
-                              new ContactAction ("call", _("Call"),
-                                                 boost::bind (&CallCore::dial,
-                                                              this, _2),
-                                                 boost::bind (&CallCore::is_supported_uri,
-                                                              this, _2))));
 }