[ekiga/ds-opal-refactoring] Opal: Removed dead code or code that will be replaced.

[Damien Sandras <dsandras src gnome org>]

commit da51aae87661b5f212ca7f481076b2b5a871f9e4
Author: Damien Sandras <dsandras seconix com>
Date:   Sat Mar 21 18:36:37 2015 +0100

    Opal: Removed dead code or code that will be replaced.

 lib/engine/components/opal/h323-call-manager.cpp   |    3 ++-
 .../components/opal/process/h323-endpoint.cpp      |   17 -----------------
 lib/engine/components/opal/process/h323-endpoint.h |    6 ------
 .../components/opal/process/sip-endpoint.cpp       |   19 -------------------
 lib/engine/components/opal/process/sip-endpoint.h  |   10 ----------
 lib/engine/components/opal/sip-call-manager.cpp    |    3 ++-
 6 files changed, 4 insertions(+), 54 deletions(-)
---
diff --git a/lib/engine/components/opal/h323-call-manager.cpp 
b/lib/engine/components/opal/h323-call-manager.cpp
index 1dc8844..0f68f80 100644
--- a/lib/engine/components/opal/h323-call-manager.cpp
+++ b/lib/engine/components/opal/h323-call-manager.cpp
@@ -211,7 +211,8 @@ void Opal::H323::CallManager::setup (const std::string & setting)
   }
   if (setting.empty () || setting == "forward-host") {
 
-    h323_endpoint.set_forward_uri (h323_settings->get_string ("forward-host"));
+    std::cout << "FIXME" << std::endl;
+    //h323_endpoint.set_forward_uri (h323_settings->get_string ("forward-host"));
   }
   if (setting.empty () || setting == "video-role") {
 
diff --git a/lib/engine/components/opal/process/h323-endpoint.cpp 
b/lib/engine/components/opal/process/h323-endpoint.cpp
index f18c995..120f1ef 100644
--- a/lib/engine/components/opal/process/h323-endpoint.cpp
+++ b/lib/engine/components/opal/process/h323-endpoint.cpp
@@ -142,7 +142,6 @@ Opal::H323::EndPoint::EndPoint (Opal::EndPoint & _endpoint,
                                 const Ekiga::ServiceCore& _core): H323EndPoint (_endpoint),
                                                                   core (_core)
 {
-  uri_prefix = "h323:";
   /* Ready to take calls */
   GetManager ().AddRouteEntry("h323:.* = pc:*");
   GetManager ().AddRouteEntry("pc:.* = h323:<da>");
@@ -227,22 +226,6 @@ Opal::H323::EndPoint::set_initial_bandwidth (unsigned bitrate)
 
 
 void
-Opal::H323::EndPoint::set_forward_uri (const std::string& uri)
-{
-  if (!uri.empty ())
-    forward_uri = uri;
-  PTRACE (4, "Opal::H323::EndPoint\tSet Forward URI to " << uri);
-}
-
-
-const std::string&
-Opal::H323::EndPoint::get_forward_uri () const
-{
-  return forward_uri;
-}
-
-
-void
 Opal::H323::EndPoint::enable_account (Account& account)
 {
   new gatekeeper_handler (account, *this, true);
diff --git a/lib/engine/components/opal/process/h323-endpoint.h 
b/lib/engine/components/opal/process/h323-endpoint.h
index fd43c94..34f7677 100644
--- a/lib/engine/components/opal/process/h323-endpoint.h
+++ b/lib/engine/components/opal/process/h323-endpoint.h
@@ -77,9 +77,6 @@ namespace Opal {
 
       void set_initial_bandwidth (unsigned max_tx_video_bitrate);
 
-      /* H.323 CallProtocolManager */
-      void set_forward_uri (const std::string & uri);
-      const std::string & get_forward_uri () const;
 
       /* Enable / Disable accounts. The account given as argument
        * will be updated to reflect the current account state once
@@ -104,9 +101,6 @@ namespace Opal {
       PMutex gk_name_mutex;
       PString gk_name;
 
-      std::string uri_prefix;
-      std::string forward_uri;
-
       const Ekiga::ServiceCore & core;
     };
   };
diff --git a/lib/engine/components/opal/process/sip-endpoint.cpp 
b/lib/engine/components/opal/process/sip-endpoint.cpp
index 3884822..6761533 100644
--- a/lib/engine/components/opal/process/sip-endpoint.cpp
+++ b/lib/engine/components/opal/process/sip-endpoint.cpp
@@ -113,8 +113,6 @@ Opal::Sip::EndPoint::EndPoint (Opal::EndPoint & _endpoint,
   boost::shared_ptr<Ekiga::ChatCore> chat_core = core.get<Ekiga::ChatCore> ("chat-core");
   boost::shared_ptr<Ekiga::PresenceCore> presence_core = core.get<Ekiga::PresenceCore> ("presence-core");
 
-  uri_prefix = "sip:";
-
   /* Timeouts */
   SetAckTimeout (PTimeInterval (0, 32));
   SetPduCleanUpTimeout (PTimeInterval (0, 1));
@@ -235,23 +233,6 @@ Opal::Sip::EndPoint::StartListener (unsigned port)
 
 
 void
-Opal::Sip::EndPoint::set_forward_uri (const std::string & uri)
-{
-  if (!uri.empty ()) {
-    forward_uri = uri;
-    PTRACE (4, "Opal::Sip::EndPoint\tSet Forward URI to " << uri);
-  }
-}
-
-
-const std::string&
-Opal::Sip::EndPoint::get_forward_uri () const
-{
-  return forward_uri;
-}
-
-
-void
 Opal::Sip::EndPoint::set_outbound_proxy (const std::string & uri)
 {
   if (!uri.empty ()) {
diff --git a/lib/engine/components/opal/process/sip-endpoint.h 
b/lib/engine/components/opal/process/sip-endpoint.h
index 9aa4968..d342cd1 100644
--- a/lib/engine/components/opal/process/sip-endpoint.h
+++ b/lib/engine/components/opal/process/sip-endpoint.h
@@ -63,9 +63,6 @@ namespace Opal {
 
     public:
 
-      typedef std::list<std::string> domain_list;
-      typedef std::list<std::string>::iterator domain_list_iterator;
-
       EndPoint (Opal::EndPoint& ep,
                const Ekiga::ServiceCore& core);
 
@@ -86,9 +83,6 @@ namespace Opal {
       void set_outbound_proxy (const std::string & uri);
       const std::string & get_outbound_proxy () const;
 
-      void set_forward_uri (const std::string & uri);
-      const std::string & get_forward_uri () const;
-
       // a message waiting information was received
       // the parameters are the aor and the info
       boost::signals2::signal<void(std::string, std::string)> mwi_event;
@@ -124,10 +118,6 @@ namespace Opal {
 
       /* Callbacks */
     private:
-      std::map<std::string, PString> publications;
-
-      std::string uri_prefix;
-      std::string forward_uri;
       std::string outbound_proxy;
 
       const Ekiga::ServiceCore & core;
diff --git a/lib/engine/components/opal/sip-call-manager.cpp b/lib/engine/components/opal/sip-call-manager.cpp
index 981e965..74eed69 100644
--- a/lib/engine/components/opal/sip-call-manager.cpp
+++ b/lib/engine/components/opal/sip-call-manager.cpp
@@ -181,7 +181,8 @@ void Opal::Sip::CallManager::setup (const std::string & setting)
   }
 
   if (setting.empty () || setting == "forward-host")  {
-    sip_endpoint.set_forward_uri (sip_settings->get_string ("forward-host"));
+    std::cout << "FIXME" << std::endl;
+    //sip_endpoint.set_forward_uri (sip_settings->get_string ("forward-host"));
   }
 
   Opal::CallManager::setup (setting);