[ekiga] Modified the initialization order in the opal code
- From: Julien Puydt <jpuydt src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ekiga] Modified the initialization order in the opal code
- Date: Fri, 14 Jan 2011 12:56:58 +0000 (UTC)
commit 7ccafa4ad73e6266a61c8c03e9ca28acc25bade5
Author: Snark <jpuydt gnome org>
Date: Thu Dec 23 22:06:32 2010 +0100
Modified the initialization order in the opal code
It should make objects widely available sooner.
lib/engine/components/opal/opal-main.cpp | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/lib/engine/components/opal/opal-main.cpp b/lib/engine/components/opal/opal-main.cpp
index 3f8ca8b..13a7d21 100644
--- a/lib/engine/components/opal/opal-main.cpp
+++ b/lib/engine/components/opal/opal-main.cpp
@@ -115,8 +115,9 @@ struct OPALSpark: public Ekiga::Spark
hook_ekiga_plugins_to_opal (core);
boost::shared_ptr<CallManager> call_manager (new CallManager (core));
+ core.add (call_manager);
+
boost::shared_ptr<Bank> bank (new Bank (core));
- boost::shared_ptr<PresenceManager> presence_manager (new PresenceManager (bank));
account_core->add_bank (bank);
core.add (bank);
@@ -124,13 +125,16 @@ struct OPALSpark: public Ekiga::Spark
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));
+ core.add (sip_manager);
+
call_manager->add_protocol_manager (sip_manager);
contact_core->add_contact_decorator (sip_manager);
presence_core->add_presentity_decorator (sip_manager);
presence_core->add_presence_fetcher (sip_manager);
presence_core->add_presence_publisher (sip_manager);
+
+ boost::shared_ptr<PresenceManager> presence_manager (new PresenceManager (bank));
presence_core->add_presence_publisher (presence_manager);
- core.add (sip_manager);
#ifdef HAVE_H323
unsigned h323_port = gm_conf_get_int (H323_KEY "listen_port");
@@ -143,8 +147,6 @@ struct OPALSpark: public Ekiga::Spark
call_core->add_manager (call_manager);
- core.add (call_manager);
-
new ConfBridge (*call_manager); // FIXME: isn't that leaked!?
presence_core->add_supported_uri (&is_supported_address); //FIXME
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]