[ekiga] Made it clearer that the GUI-building code can't leak the Ekiga::ServiceCore
- From: Julien Puydt <jpuydt src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ekiga] Made it clearer that the GUI-building code can't leak the Ekiga::ServiceCore
- Date: Fri, 8 Jun 2012 18:48:24 +0000 (UTC)
commit 41843a65f869642ec101192f5d06814010c54269
Author: Julien Puydt <jpuydt free fr>
Date: Fri Jun 8 19:39:56 2012 +0200
Made it clearer that the GUI-building code can't leak the Ekiga::ServiceCore
src/ekiga.cpp | 6 +++---
src/ekiga.h | 2 +-
src/gui/main.cpp | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/src/ekiga.cpp b/src/ekiga.cpp
index dd6dbcd..1b77467 100644
--- a/src/ekiga.cpp
+++ b/src/ekiga.cpp
@@ -102,15 +102,15 @@ void GnomeMeeting::Main ()
}
-void GnomeMeeting::BuildGUI (Ekiga::ServiceCorePtr services)
+void GnomeMeeting::BuildGUI (Ekiga::ServiceCore& services)
{
/* Init the stock icons */
gnomemeeting_stock_icons_init ();
/* Build the GUI */
gtk_window_set_default_icon_name (GM_ICON_LOGO);
- assistant_window = ekiga_assistant_new (*services);
- main_window = gm_main_window_new (*services);
+ assistant_window = ekiga_assistant_new (services);
+ main_window = gm_main_window_new (services);
// FIXME should be moved in ekiga_assistant_new
gtk_window_set_transient_for (GTK_WINDOW (assistant_window), GTK_WINDOW (main_window));
diff --git a/src/ekiga.h b/src/ekiga.h
index d039840..2c51c45 100644
--- a/src/ekiga.h
+++ b/src/ekiga.h
@@ -102,7 +102,7 @@ class GnomeMeeting : public PProcess
* stored in config.
* PRE : /
*/
- void BuildGUI (Ekiga::ServiceCorePtr services);
+ void BuildGUI (Ekiga::ServiceCore& services);
private:
diff --git a/src/gui/main.cpp b/src/gui/main.cpp
index 273648e..db58862 100644
--- a/src/gui/main.cpp
+++ b/src/gui/main.cpp
@@ -189,7 +189,7 @@ main (int argc,
Ekiga::Runtime::init ();
engine_init (service_core, argc, argv);
- GnomeMeeting::Process ()->BuildGUI (service_core);
+ GnomeMeeting::Process ()->BuildGUI (*service_core);
main_window = GnomeMeeting::Process ()->GetMainWindow ();
const int schema_version = MAJOR_VERSION * 1000
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]