[ekiga] Modified how the SIP endpoint gets the listen port



commit 665277f16f3ea77f521315661e62b2806af9ff45
Author: Julien Puydt <jpuydt free fr>
Date:   Fri Feb 8 08:15:02 2013 +0100

    Modified how the SIP endpoint gets the listen port

 lib/engine/components/opal/opal-main.cpp    |    3 +--
 lib/engine/components/opal/sip-endpoint.cpp |    6 +++---
 lib/engine/components/opal/sip-endpoint.h   |    3 +--
 3 files changed, 5 insertions(+), 7 deletions(-)
---
diff --git a/lib/engine/components/opal/opal-main.cpp b/lib/engine/components/opal/opal-main.cpp
index 634393e..47a074d 100644
--- a/lib/engine/components/opal/opal-main.cpp
+++ b/lib/engine/components/opal/opal-main.cpp
@@ -116,8 +116,7 @@ struct OPALSpark: public Ekiga::Spark
       boost::shared_ptr<CallManager> call_manager (new CallManager (core));
       core.add (call_manager);
 
-      unsigned sip_port = gm_conf_get_int (SIP_KEY "listen_port");
-      boost::shared_ptr<Sip::EndPoint> sip_manager (new Sip::EndPoint (*call_manager, core, sip_port), null_deleter ());
+      boost::shared_ptr<Sip::EndPoint> sip_manager (new Sip::EndPoint (*call_manager, core), null_deleter ());
       call_manager->set_sip_endpoint (sip_manager);
       core.add (sip_manager);
 
diff --git a/lib/engine/components/opal/sip-endpoint.cpp b/lib/engine/components/opal/sip-endpoint.cpp
index 927a1a7..017ffb6 100644
--- a/lib/engine/components/opal/sip-endpoint.cpp
+++ b/lib/engine/components/opal/sip-endpoint.cpp
@@ -113,8 +113,7 @@ namespace Opal {
 
 /* The class */
 Opal::Sip::EndPoint::EndPoint (Opal::CallManager & _manager,
-                               Ekiga::ServiceCore& core,
-                               unsigned _listen_port):
+                               Ekiga::ServiceCore& core):
   SIPEndPoint (_manager),
   manager (_manager)
 {
@@ -122,7 +121,8 @@ Opal::Sip::EndPoint::EndPoint (Opal::CallManager & _manager,
 
   protocol_name = "sip";
   uri_prefix = "sip:";
-  listen_port = (_listen_port > 0 ? _listen_port : 5060);
+  listen_port = gm_conf_get_int (SIP_KEY "listen_port");
+  listen_port = (listen_port > 0 ? listen_port : 5060);
 
   dialect = boost::shared_ptr<SIP::Dialect>(new SIP::Dialect (core, boost::bind (&Opal::Sip::EndPoint::send_message, this, _1, _2)));
   chat_core->add_dialect (dialect);
diff --git a/lib/engine/components/opal/sip-endpoint.h b/lib/engine/components/opal/sip-endpoint.h
index 4790d1b..8adfa95 100644
--- a/lib/engine/components/opal/sip-endpoint.h
+++ b/lib/engine/components/opal/sip-endpoint.h
@@ -69,8 +69,7 @@ namespace Opal {
       typedef std::list<std::string>::iterator domain_list_iterator;
 
       EndPoint (CallManager& ep,
-		Ekiga::ServiceCore& core,
-		unsigned listen_port);
+		Ekiga::ServiceCore& core);
 
       ~EndPoint ();
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]