[ekiga/ds-opal-refactoring] Opal: Fixed Opal plugins hooking.
- From: Damien Sandras <dsandras src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ekiga/ds-opal-refactoring] Opal: Fixed Opal plugins hooking.
- Date: Sun, 22 Mar 2015 17:47:55 +0000 (UTC)
commit d65904a71ee6ca5aadce1ee8d337f9e33774a2a1
Author: Damien Sandras <dsandras seconix com>
Date: Sun Mar 22 18:27:31 2015 +0100
Opal: Fixed Opal plugins hooking.
lib/engine/components/opal/opal-main.cpp | 4 ----
.../components/opal/process/opal-process.cpp | 5 +++--
lib/engine/engine.cpp | 4 +++-
3 files changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/lib/engine/components/opal/opal-main.cpp b/lib/engine/components/opal/opal-main.cpp
index 96b3e22..150ae86 100644
--- a/lib/engine/components/opal/opal-main.cpp
+++ b/lib/engine/components/opal/opal-main.cpp
@@ -46,8 +46,6 @@
#include "videoinput-core.h"
#include "videooutput-core.h"
-#include "opal-plugins-hook.h"
-
#include "sip-call-manager.h"
#ifdef HAVE_H323
@@ -109,8 +107,6 @@ public:
&& audiooutput_core && videooutput_core && personal_details
&& !account_store) {
- hook_ekiga_plugins_to_opal (core);
-
Opal::EndPoint& endpoint = GnomeMeeting::Process ()->GetEndPoint ();
Opal::Sip::EndPoint& sip_endpoint = endpoint.GetSipEndPoint ();
#ifdef HAVE_H323
diff --git a/lib/engine/components/opal/process/opal-process.cpp
b/lib/engine/components/opal/process/opal-process.cpp
index 14b76d3..d4c0b9a 100644
--- a/lib/engine/components/opal/process/opal-process.cpp
+++ b/lib/engine/components/opal/process/opal-process.cpp
@@ -40,10 +40,10 @@
#include <gtk/gtk.h>
-#include "runtime.h"
-
#include "call-core.h"
+#include "opal-plugins-hook.h"
+
GnomeMeeting *GnomeMeeting::GM = 0;
/* The main GnomeMeeting Class */
@@ -73,6 +73,7 @@ void GnomeMeeting::Main ()
void GnomeMeeting::Start (Ekiga::ServiceCore& core)
{
+ hook_ekiga_plugins_to_opal (core);
endpoint = new Opal::EndPoint (core);
}
diff --git a/lib/engine/engine.cpp b/lib/engine/engine.cpp
index f8ce327..5843b61 100644
--- a/lib/engine/engine.cpp
+++ b/lib/engine/engine.cpp
@@ -93,7 +93,6 @@ engine_init (Ekiga::ServiceCore& core,
{
// AT THE VERY FIRST, create the PProcess
GnomeMeeting & instance = opal_init_pprocess (argc, argv);
- instance.Start (core);
// FIRST we add a few things by hand
// (for speed and because that's less code)
@@ -137,6 +136,9 @@ engine_init (Ekiga::ServiceCore& core,
return;
}
+ //
+ instance.Start (core);
+
// THEN we use the kickstart scheme
Ekiga::KickStart kickstart;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]