[ekiga] Some more cleanup of the code in engine.cpp

[Julien Puydt <jpuydt src gnome org>]

commit 0ab2f82b854caf1679b448889724c39ba41df306
Author: Julien Puydt <jpuydt gnome org>
Date:   Sun Sep 26 14:24:57 2010 +0200

    Some more cleanup of the code in engine.cpp

 lib/engine/engine.cpp   |   26 ++++++--------------------
 lib/engine/engine.h     |    2 --
 src/gui/main_window.cpp |    1 -
 3 files changed, 6 insertions(+), 23 deletions(-)
---
diff --git a/lib/engine/engine.cpp b/lib/engine/engine.cpp
index 7ba1ea1..3259fc4 100644
--- a/lib/engine/engine.cpp
+++ b/lib/engine/engine.cpp
@@ -102,9 +102,6 @@
 #include <iostream>
 #endif
 
-// FIXME: this *MUST* die soon
-static Ekiga::ServiceCorePtr service_core_ptr;
-
 void
 engine_init (Ekiga::ServiceCorePtr service_core,
 	     int argc,
@@ -112,8 +109,6 @@ engine_init (Ekiga::ServiceCorePtr service_core,
 {
   Ekiga::KickStart kickstart;
 
-  service_core_ptr = service_core;
-
   service_core->add (Ekiga::ServicePtr(new Ekiga::NotificationCore));
 
   boost::shared_ptr<Ekiga::AccountCore> account_core (new Ekiga::AccountCore);
@@ -144,7 +139,7 @@ engine_init (Ekiga::ServiceCorePtr service_core,
   service_core->add (call_core);
 
   if (!gmconf_personal_details_init (*service_core, &argc, &argv)) {
-    service_core_ptr.reset ();
+
     return;
   }
 
@@ -153,20 +148,20 @@ engine_init (Ekiga::ServiceCorePtr service_core,
 
 #ifndef WIN32
   if (!videooutput_x_init (*service_core, &argc, &argv)) {
-    service_core_ptr.reset ();
+
     return;
   }
 #endif
 
 #ifdef HAVE_DX
   if (!videooutput_dx_init (*service_core, &argc, &argv)) {
-    service_core.reset ();
+
     return;
   }
 #endif
 
   if (!videoinput_mlogo_init (*service_core, &argc, &argv)) {
-    service_core_ptr.reset ();
+
     return;
   }
 
@@ -206,12 +201,12 @@ engine_init (Ekiga::ServiceCorePtr service_core,
   kickstart.kick (*service_core, &argc, &argv);
 
   if (!gtk_core_init (*service_core, &argc, &argv)) {
-    service_core_ptr.reset ();
+
     return;
   }
 
   if (!gtk_frontend_init (*service_core, &argc, &argv)) {
-    service_core_ptr.reset ();
+
     return;
   }
 
@@ -243,12 +238,3 @@ engine_init (Ekiga::ServiceCorePtr service_core,
   service_core->dump (std::cout);
 #endif
 }
-
-void
-engine_stop ()
-{
-  if (service_core_ptr) {
-
-    service_core_ptr.reset ();
-  }
-}
diff --git a/lib/engine/engine.h b/lib/engine/engine.h
index bf9d2ac..28854a2 100644
--- a/lib/engine/engine.h
+++ b/lib/engine/engine.h
@@ -49,8 +49,6 @@ void engine_init (Ekiga::ServiceCorePtr service_core,
 		  int argc,
 		  char *argv[]);
 
-void engine_stop ();
-
 /**
  * @}
  */
diff --git a/src/gui/main_window.cpp b/src/gui/main_window.cpp
index c381ced..40173d1 100644
--- a/src/gui/main_window.cpp
+++ b/src/gui/main_window.cpp
@@ -4530,7 +4530,6 @@ main (int argc,
   /* Exit Ekiga */
   GnomeMeeting::Process ()->Exit ();
 
-  engine_stop ();
   Ekiga::Runtime::quit ();
 
   /* Save and shutdown the configuration */