[ekiga] Fix synchronisation between STUN and account registration

[Eugen Dedu <ededu src gnome org>]

commit 9984d4be4cce0b767480202a4b222d289f83d6fc
Author: Eugen Dedu <eugen dedu univ-fcomte fr>
Date:   Wed Apr 22 15:37:36 2015 +0200

    Fix synchronisation between STUN and account registration

 lib/engine/components/opal/opal-call-manager.cpp |    7 -------
 lib/engine/components/opal/opal-call-manager.h   |    1 -
 lib/engine/components/opal/sip-call-manager.cpp  |    7 +++++++
 3 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/lib/engine/components/opal/opal-call-manager.cpp 
b/lib/engine/components/opal/opal-call-manager.cpp
index d5e82e7..be2f80c 100644
--- a/lib/engine/components/opal/opal-call-manager.cpp
+++ b/lib/engine/components/opal/opal-call-manager.cpp
@@ -50,7 +50,6 @@ Opal::CallManager::CallManager (Ekiga::ServiceCore& _core,
 {
   /* Setup things */
   Ekiga::SettingsCallback setup_cb = boost::bind (&Opal::CallManager::setup, this, _1);
-  nat_settings = Ekiga::SettingsPtr (new Ekiga::Settings (NAT_SCHEMA, setup_cb));
   audio_codecs_settings = Ekiga::SettingsPtr (new Ekiga::Settings (AUDIO_CODECS_SCHEMA, setup_cb));
   video_codecs_settings = Ekiga::SettingsPtr (new Ekiga::Settings (VIDEO_CODECS_SCHEMA, setup_cb));
   video_devices_settings = Ekiga::SettingsPtr (new Ekiga::Settings (VIDEO_DEVICES_SCHEMA, setup_cb));
@@ -59,12 +58,6 @@ Opal::CallManager::CallManager (Ekiga::ServiceCore& _core,
   call_options_settings = Ekiga::SettingsPtr (new Ekiga::Settings (CALL_OPTIONS_SCHEMA, setup_cb));
   call_forwarding_settings = Ekiga::SettingsPtr (new Ekiga::Settings (CALL_FORWARDING_SCHEMA, setup_cb));
   personal_data_settings = Ekiga::SettingsPtr (new Ekiga::Settings (PERSONAL_DATA_SCHEMA, setup_cb));
-
-  /* STUN must be enabled at the very beginning */
-  if (nat_settings->get_bool ("enable-stun") && !nat_settings->get_string ("stun-server").empty ())
-    endpoint.SetStunServer (nat_settings->get_string ("stun-server"));
-  else
-    endpoint.SetStunServer (PString::Empty ());
 }
 
 
diff --git a/lib/engine/components/opal/opal-call-manager.h b/lib/engine/components/opal/opal-call-manager.h
index 18f648a..df4c7e2 100644
--- a/lib/engine/components/opal/opal-call-manager.h
+++ b/lib/engine/components/opal/opal-call-manager.h
@@ -133,7 +133,6 @@ protected:
 
 private:
 
-    Ekiga::SettingsPtr nat_settings;
     Ekiga::SettingsPtr audio_codecs_settings;
     Ekiga::SettingsPtr video_codecs_settings;
     Ekiga::SettingsPtr video_devices_settings;
diff --git a/lib/engine/components/opal/sip-call-manager.cpp b/lib/engine/components/opal/sip-call-manager.cpp
index efbcec0..5a26673 100644
--- a/lib/engine/components/opal/sip-call-manager.cpp
+++ b/lib/engine/components/opal/sip-call-manager.cpp
@@ -65,6 +65,13 @@ Opal::Sip::CallManager::CallManager (Ekiga::ServiceCore& _core,
     instance_id = (const char*) PGloballyUniqueID ().AsString ();
     sip_settings->set_string ("instance-id", instance_id);
   }
+
+  /* STUN must be enabled at the very beginning */
+  Ekiga::SettingsPtr nat_settings = Ekiga::SettingsPtr (new Ekiga::Settings (NAT_SCHEMA, setup_cb));
+  if (nat_settings->get_bool ("enable-stun") && !nat_settings->get_string ("stun-server").empty ())
+    _endpoint.SetStunServer (nat_settings->get_string ("stun-server"));
+  else
+    _endpoint.SetStunServer (PString::Empty ());
 }