[ekiga/ds-gsettings3] Opal: Fixed objects initialisation.

[Damien Sandras <dsandras src gnome org>]

commit 7032490c076dcd7c42d7661a93700d09c795f3c4
Author: Damien Sandras <dsandras beip be>
Date:   Sat Nov 23 12:01:10 2013 +0100

    Opal: Fixed objects initialisation.
    
    We still need to rely on a public setup method to define initialisation
    order.
    
    Otherwise, the OpalCallManager could emit the "ready" signal (indicating
    it is ready to process calls and registrations) before other objects had the
    time to connect to it.

 lib/engine/components/opal/h323-endpoint.cpp     |    2 --
 lib/engine/components/opal/opal-call-manager.cpp |    2 --
 lib/engine/components/opal/opal-call-manager.h   |    6 +++---
 lib/engine/components/opal/opal-main.cpp         |    3 ++-
 4 files changed, 5 insertions(+), 8 deletions(-)
---
diff --git a/lib/engine/components/opal/h323-endpoint.cpp b/lib/engine/components/opal/h323-endpoint.cpp
index 0113428..dcbfd9f 100644
--- a/lib/engine/components/opal/h323-endpoint.cpp
+++ b/lib/engine/components/opal/h323-endpoint.cpp
@@ -106,8 +106,6 @@ Opal::H323::EndPoint::EndPoint (Opal::CallManager & _manager):
 
   video_codecs_settings = boost::shared_ptr<Ekiga::Settings> (new Ekiga::Settings (VIDEO_CODECS_SCHEMA));
   video_codecs_settings->changed.connect (boost::bind (&EndPoint::setup, this, _1));
-
-  setup ();
 }
 
 Opal::H323::EndPoint::~EndPoint ()
diff --git a/lib/engine/components/opal/opal-call-manager.cpp 
b/lib/engine/components/opal/opal-call-manager.cpp
index 6c1fc08..f551aaf 100644
--- a/lib/engine/components/opal/opal-call-manager.cpp
+++ b/lib/engine/components/opal/opal-call-manager.cpp
@@ -210,8 +210,6 @@ CallManager::CallManager (Ekiga::ServiceCore& core)
   personal_data_settings =
     boost::shared_ptr<Ekiga::Settings> (new Ekiga::Settings (PERSONAL_DATA_SCHEMA));
   personal_data_settings->changed.connect (boost::bind (&CallManager::setup, this, _1));
-
-  setup ();
 }
 
 
diff --git a/lib/engine/components/opal/opal-call-manager.h b/lib/engine/components/opal/opal-call-manager.h
index dd51a11..80bd1a0 100644
--- a/lib/engine/components/opal/opal-call-manager.h
+++ b/lib/engine/components/opal/opal-call-manager.h
@@ -92,6 +92,9 @@ public:
                        const std::string uri,
                        Ekiga::MenuBuilder& builder);
 
+    /* Set up endpoint: all options or a specific setting */
+    void setup (const std::string & setting = "");
+
     /** Call Manager **/
     bool dial (const std::string & uri); 
 
@@ -200,9 +203,6 @@ private:
                                              PVideoOutputDevice * & device,
                                              PBoolean & auto_delete);
 
-    /* Set up endpoint: all options or a specific setting */
-    void setup (const std::string & setting = "");
-
     /* The various related endpoints */
     GMPCSSEndpoint *pcssEP;
 
diff --git a/lib/engine/components/opal/opal-main.cpp b/lib/engine/components/opal/opal-main.cpp
index dbee7c1..10422b1 100644
--- a/lib/engine/components/opal/opal-main.cpp
+++ b/lib/engine/components/opal/opal-main.cpp
@@ -111,8 +111,8 @@ struct OPALSpark: public Ekiga::Spark
       core.add (call_manager);
 
       boost::shared_ptr<Sip::EndPoint> sip_manager (new Sip::EndPoint (*call_manager, core), null_deleter 
());
+      std::cout << "FIXME: where is H323" << std::endl << std::flush;
       sip_manager->setup ();
-      std::cout << "FIXME: why are we doing this only for the SIP endpoint and not for the H.323 endpoint?" 
<< std::endl << std::flush;
       call_manager->set_sip_endpoint (sip_manager);
       core.add (sip_manager);
 
@@ -122,6 +122,7 @@ struct OPALSpark: public Ekiga::Spark
       contact_core->add_contact_decorator (bank);
       presence_core->add_presentity_decorator (bank);
       call_manager->ready.connect (boost::bind (&Opal::Bank::call_manager_ready, &*bank));
+      call_manager->setup ();
       presence_core->add_presence_publisher (bank);
       presence_core->add_presence_fetcher (bank);