[ekiga] Modified how the H323 endpoint gets the listen port and kind of net

[Julien Puydt <jpuydt src gnome org>]

commit a043cb107700b0f8002b8115f3f52a830652ac2f
Author: Julien Puydt <jpuydt free fr>
Date:   Fri Feb 8 08:32:50 2013 +0100

    Modified how the H323 endpoint gets the listen port and kind of net

 lib/engine/components/opal/h323-endpoint.cpp |    7 ++++---
 lib/engine/components/opal/h323-endpoint.h   |    2 +-
 lib/engine/components/opal/opal-main.cpp     |    4 +---
 3 files changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/lib/engine/components/opal/h323-endpoint.cpp b/lib/engine/components/opal/h323-endpoint.cpp
index eec597c..ad1eeeb 100644
--- a/lib/engine/components/opal/h323-endpoint.cpp
+++ b/lib/engine/components/opal/h323-endpoint.cpp
@@ -91,16 +91,17 @@ namespace Opal {
 
 
 /* The class */
-Opal::H323::EndPoint::EndPoint (Opal::CallManager & _manager, unsigned _listen_port, unsigned _kind_of_net):
+Opal::H323::EndPoint::EndPoint (Opal::CallManager & _manager):
   H323EndPoint (_manager),
   manager (_manager)
 {
   protocol_name = "h323";
   uri_prefix = "h323:";
-  listen_port = (_listen_port > 0 ? _listen_port : 1720);
+  listen_port = gm_conf_get_int (H323_KEY "listen_port");
+  listen_port = (listen_port > 0 ? listen_port : 1720);
 
   /* Initial requested bandwidth */
-  set_initial_bandwidth (_kind_of_net);
+  set_initial_bandwidth (gm_conf_get_int (GENERAL_KEY "kind_of_net"));
 
   /* Start listener */
   set_listen_port (listen_port);
diff --git a/lib/engine/components/opal/h323-endpoint.h b/lib/engine/components/opal/h323-endpoint.h
index e2807a0..205e7e8 100644
--- a/lib/engine/components/opal/h323-endpoint.h
+++ b/lib/engine/components/opal/h323-endpoint.h
@@ -63,7 +63,7 @@ namespace Opal {
       PCLASSINFO(EndPoint, H323EndPoint);
 
   public:
-      EndPoint (CallManager &_manager, unsigned listen_port, unsigned kind_of_net);
+      EndPoint (CallManager &_manager);
 
       ~EndPoint ();
 
diff --git a/lib/engine/components/opal/opal-main.cpp b/lib/engine/components/opal/opal-main.cpp
index 47a074d..5339e15 100644
--- a/lib/engine/components/opal/opal-main.cpp
+++ b/lib/engine/components/opal/opal-main.cpp
@@ -121,9 +121,7 @@ struct OPALSpark: public Ekiga::Spark
       core.add (sip_manager);
 
 #ifdef HAVE_H323
-      unsigned h323_port = gm_conf_get_int (H323_KEY "listen_port");
-      unsigned kind_of_net = gm_conf_get_int (GENERAL_KEY "kind_of_net");
-      boost::shared_ptr<H323::EndPoint> h323_manager (new H323::EndPoint (*call_manager, h323_port, kind_of_net), null_deleter ());
+      boost::shared_ptr<H323::EndPoint> h323_manager (new H323::EndPoint (*call_manager), null_deleter ());
       call_manager->set_h323_endpoint (h323_manager);
       core.add (h323_manager);
 #endif