[ekiga] Protocol: Removed transfer method from the API.

[Damien Sandras <dsandras src gnome org>]

commit 0a3fc6427e7329bd9f16838d6abfce3efcaeda2a
Author: Damien Sandras <dsandras seconix com>
Date:   Tue Jan 13 22:20:02 2015 +0100

    Protocol: Removed transfer method from the API.
    
    1) Not all protocols support call transfer.
    2) It should be part of the Call API, not of the Managers API. We have a
    Call, we transfer it.

 lib/engine/components/opal/opal-call-manager.cpp |   13 ----------
 lib/engine/components/opal/opal-call-manager.h   |    2 -
 lib/engine/components/opal/sip-endpoint.cpp      |   28 ----------------------
 lib/engine/components/opal/sip-endpoint.h        |    3 +-
 lib/engine/protocol/call-core.cpp                |   14 -----------
 lib/engine/protocol/call-core.h                  |   11 --------
 lib/engine/protocol/call-manager.h               |   12 ---------
 lib/engine/protocol/call-protocol-manager.h      |   10 --------
 8 files changed, 1 insertions(+), 92 deletions(-)
---
diff --git a/lib/engine/components/opal/opal-call-manager.cpp 
b/lib/engine/components/opal/opal-call-manager.cpp
index 92d7979..6c9180d 100644
--- a/lib/engine/components/opal/opal-call-manager.cpp
+++ b/lib/engine/components/opal/opal-call-manager.cpp
@@ -558,19 +558,6 @@ void CallManager::hang_up ()
 }
 
 
-bool CallManager::transfer (const std::string & uri,
-                            bool attended)
-{
-  for (Ekiga::CallManager::iterator iter = Ekiga::CallManager::begin ();
-       iter != Ekiga::CallManager::end ();
-       iter++)
-    if ((*iter)->transfer (uri, attended))
-      return true;
-
-  return false;
-}
-
-
 bool CallManager::is_supported_uri (const std::string & uri)
 {
   for (Ekiga::CallManager::iterator iter = Ekiga::CallManager::begin ();
diff --git a/lib/engine/components/opal/opal-call-manager.h b/lib/engine/components/opal/opal-call-manager.h
index 2108cd0..5414f4e 100644
--- a/lib/engine/components/opal/opal-call-manager.h
+++ b/lib/engine/components/opal/opal-call-manager.h
@@ -106,8 +106,6 @@ public:
     /** Call Manager **/
     bool dial (const std::string & uri);
     void hang_up ();
-    bool transfer (const std::string & uri,
-                   bool attended);
     bool is_supported_uri (const std::string & uri);
 
     void set_display_name (const std::string & name);
diff --git a/lib/engine/components/opal/sip-endpoint.cpp b/lib/engine/components/opal/sip-endpoint.cpp
index 3c1df70..7ee8c83 100644
--- a/lib/engine/components/opal/sip-endpoint.cpp
+++ b/lib/engine/components/opal/sip-endpoint.cpp
@@ -149,34 +149,6 @@ Opal::Sip::EndPoint::dial (const std::string & uri)
 
 
 bool
-Opal::Sip::EndPoint::transfer (const std::string & uri,
-                               bool attended)
-{
-  /* This is not handled yet */
-  if (attended)
-    return false;
-
-  if (GetConnectionCount () == 0 || !is_supported_uri (uri))
-      return false; /* No active SIP connection to transfer, or
-                     * transfer request to unsupported uri
-                     */
-
-  /* We don't handle several calls here */
-  for (PSafePtr<OpalConnection> connection(connectionsActive, PSafeReference);
-       connection != NULL;
-       ++connection) {
-    if (!PIsDescendant(&(*connection), OpalPCSSConnection)) {
-      connection->TransferConnection (uri);
-      return true; /* We could handle the transfer */
-    }
-  }
-
-  return false;
-}
-
-
-
-bool
 Opal::Sip::EndPoint::is_supported_uri (const std::string & uri)
 {
   return (!uri.empty () && (uri.find ("sip:") == 0 || uri.find (':') == string::npos));
diff --git a/lib/engine/components/opal/sip-endpoint.h b/lib/engine/components/opal/sip-endpoint.h
index 8888205..bac3892 100644
--- a/lib/engine/components/opal/sip-endpoint.h
+++ b/lib/engine/components/opal/sip-endpoint.h
@@ -91,8 +91,7 @@ namespace Opal {
 
       /* CallProtocolManager */
       bool dial (const std::string & uri);
-      bool transfer (const std::string & uri,
-                     bool attended);
+
       bool is_supported_uri (const std::string & uri);
 
 
diff --git a/lib/engine/protocol/call-core.cpp b/lib/engine/protocol/call-core.cpp
index 817caab..5665940 100644
--- a/lib/engine/protocol/call-core.cpp
+++ b/lib/engine/protocol/call-core.cpp
@@ -106,20 +106,6 @@ void CallCore::hang_up ()
 }
 
 
-bool CallCore::transfer (const std::string & uri,
-                         bool attended)
-{
-  for (std::set<boost::shared_ptr<CallManager> >::iterator iter = managers.begin ();
-       iter != managers.end ();
-       iter++) {
-    if ((*iter)->transfer (uri, attended))
-      return true;
-  }
-
-  return false;
-}
-
-
 bool CallCore::is_supported_uri (const std::string & uri)
 {
   for (std::set<boost::shared_ptr<CallManager> >::iterator iter = managers.begin ();
diff --git a/lib/engine/protocol/call-core.h b/lib/engine/protocol/call-core.h
index 0eabff0..7f3df04 100644
--- a/lib/engine/protocol/call-core.h
+++ b/lib/engine/protocol/call-core.h
@@ -136,17 +136,6 @@ namespace Ekiga
        */
       bool dial (const std::string & uri);
 
-      /** Transfer the call to the specified uri
-       * @param the destination uri
-       * @param true if we should do an attended transfer, false if
-       *        a blind transfer is required.
-       * @return true if the Ekiga::Call transfer could be attempted,
-       *         false otherwise. Returning true does not mean the
-       *         transfer succeeded, it simply means it could be handled.
-       */
-      bool transfer (const std::string & uri,
-                     bool attended);
-
       /** Hang up all active calls (if any).
        */
       void hang_up ();
diff --git a/lib/engine/protocol/call-manager.h b/lib/engine/protocol/call-manager.h
index a135f92..f1a3197 100644
--- a/lib/engine/protocol/call-manager.h
+++ b/lib/engine/protocol/call-manager.h
@@ -115,18 +115,6 @@ namespace Ekiga
      */
     virtual void hang_up () = 0;
 
-    /** Transfer the call to the specified uri
-     * @param the destination uri
-     * @param true if we should do an attended transfer, false if
-     *        a blind transfer is required.
-     * @return true if the Ekiga::Call transfer could be attempted,
-     *         false otherwise. Returning true does not mean the
-     *         transfer succeeded, it simply means it could be handled.
-     */
-    virtual bool transfer (const std::string & uri,
-                           bool attended) = 0;
-
-
     /* Return true if URI can be handled by the CallCore,
      * false otherwise.
      * @param the URI to test
diff --git a/lib/engine/protocol/call-protocol-manager.h b/lib/engine/protocol/call-protocol-manager.h
index 5dda398..8a2adab 100644
--- a/lib/engine/protocol/call-protocol-manager.h
+++ b/lib/engine/protocol/call-protocol-manager.h
@@ -87,16 +87,6 @@ namespace Ekiga
      */
     virtual bool dial (const std::string & uri) = 0;
 
-    /** Transfer the call to the specified uri
-     * @param the destination uri
-     * @param true if we should do an attended transfer, false if
-     *        a blind transfer is required.
-     * @return true if the Ekiga::Call transfer could be attempted,
-     *         false otherwise. Returning true does not mean the
-     *         transfer succeeded, it simply means it could be handled.
-     */
-    virtual bool transfer (const std::string & uri,
-                           bool attended) = 0;
 
     /* Return true if URI can be handled by the CallCore,
      * false otherwise.