[ekiga/ds-opal-refactoring] Opal: Fixed objects creation order.

[Damien Sandras <dsandras src gnome org>]

commit b2c2b89d26eb54785fc14c4f1daf013433fc4ab7
Author: Damien Sandras <dsandras seconix com>
Date:   Tue Mar 31 18:13:17 2015 +0200

    Opal: Fixed objects creation order.
    
    Fixes problem where presentities Actions were not pulled in time.

 lib/engine/components/opal/h323-call-manager.cpp |    2 --
 lib/engine/components/opal/h323-call-manager.h   |    3 ++-
 lib/engine/components/opal/opal-main.cpp         |    2 ++
 lib/engine/components/opal/sip-call-manager.cpp  |    3 +--
 lib/engine/components/opal/sip-call-manager.h    |    3 ++-
 5 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/lib/engine/components/opal/h323-call-manager.cpp 
b/lib/engine/components/opal/h323-call-manager.cpp
index deb0be7..ca78709 100644
--- a/lib/engine/components/opal/h323-call-manager.cpp
+++ b/lib/engine/components/opal/h323-call-manager.cpp
@@ -55,8 +55,6 @@ Opal::H323::CallManager::CallManager (Ekiga::ServiceCore& _core,
   Ekiga::SettingsCallback setup_cb = boost::bind (&Opal::H323::CallManager::setup, this, _1);
   h323_settings = Ekiga::SettingsPtr (new Ekiga::Settings (H323_SCHEMA, setup_cb));
   video_codecs_settings = Ekiga::SettingsPtr (new Ekiga::Settings (VIDEO_CODECS_SCHEMA));
-
-  setup ();
 }
 
 
diff --git a/lib/engine/components/opal/h323-call-manager.h b/lib/engine/components/opal/h323-call-manager.h
index 42fcbd0..ed5413a 100644
--- a/lib/engine/components/opal/h323-call-manager.h
+++ b/lib/engine/components/opal/h323-call-manager.h
@@ -83,8 +83,9 @@ namespace Opal {
 
       unsigned get_dtmf_mode () const;
 
-  private:
+      /* Setup */
       void setup (const std::string & setting = "");
+  private:
 
       Ekiga::SettingsPtr h323_settings;
       Ekiga::SettingsPtr video_codecs_settings;
diff --git a/lib/engine/components/opal/opal-main.cpp b/lib/engine/components/opal/opal-main.cpp
index 150ae86..370f27d 100644
--- a/lib/engine/components/opal/opal-main.cpp
+++ b/lib/engine/components/opal/opal-main.cpp
@@ -126,12 +126,14 @@ public:
       contact_core->push_back (Ekiga::URIActionProviderPtr (sip_call_manager));
       presence_core->push_back (Ekiga::URIActionProviderPtr (sip_call_manager));
       call_core->add_manager (sip_call_manager);
+      sip_call_manager->setup ();
 
 #ifdef HAVE_H323
       boost::shared_ptr<Opal::H323::CallManager> h323_call_manager (new Opal::H323::CallManager (core, 
endpoint, h323_endpoint));
       contact_core->push_back (Ekiga::URIActionProviderPtr (h323_call_manager));
       presence_core->push_back (Ekiga::URIActionProviderPtr (h323_call_manager));
       call_core->add_manager (h323_call_manager);
+      h323_call_manager->setup ();
 #endif
 
       result = true;
diff --git a/lib/engine/components/opal/sip-call-manager.cpp b/lib/engine/components/opal/sip-call-manager.cpp
index 80bd059..2f4d9ea 100644
--- a/lib/engine/components/opal/sip-call-manager.cpp
+++ b/lib/engine/components/opal/sip-call-manager.cpp
@@ -54,8 +54,6 @@ Opal::Sip::CallManager::CallManager (Ekiga::ServiceCore& _core,
   /* Setup things */
   Ekiga::SettingsCallback setup_cb = boost::bind (&Opal::Sip::CallManager::setup, this, _1);
   sip_settings = Ekiga::SettingsPtr (new Ekiga::Settings (SIP_SCHEMA, setup_cb));
-
-  setup ();
 }
 
 
@@ -72,6 +70,7 @@ void Opal::Sip::CallManager::pull_actions (Ekiga::Actor & actor,
                                            G_GNUC_UNUSED const std::string & name,
                                            const std::string & uri)
 {
+  std::cout << "ici " << is_supported_uri (uri) << "  " << uri << std::endl;
   if (is_supported_uri (uri)) {
     add_action (actor, Ekiga::ActionPtr (new Ekiga::Action ("call", _("Call"), boost::bind 
(&Opal::CallManager::dial, this, uri))));
   }
diff --git a/lib/engine/components/opal/sip-call-manager.h b/lib/engine/components/opal/sip-call-manager.h
index 31b4a9c..303fee8 100644
--- a/lib/engine/components/opal/sip-call-manager.h
+++ b/lib/engine/components/opal/sip-call-manager.h
@@ -83,8 +83,9 @@ namespace Opal {
 
       unsigned get_dtmf_mode () const;
 
-  private:
+      /* Setup */
       void setup (const std::string & setting = "");
+  private:
 
       Ekiga::SettingsPtr sip_settings;
       Opal::Sip::EndPoint& sip_endpoint;