[ekiga] Ekiga: Only exit once.
- From: Damien Sandras <dsandras src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ekiga] Ekiga: Only exit once.
- Date: Sun, 22 Apr 2012 10:43:09 +0000 (UTC)
commit a774d90b4d86b656d189677bc30b46e4655fad04
Author: Damien Sandras <dsandras beip be>
Date: Sun Apr 22 12:41:30 2012 +0200
Ekiga: Only exit once.
src/ekiga.cpp | 6 ------
src/ekiga.h | 7 -------
src/gui/main_window.cpp | 3 +--
3 files changed, 1 insertions(+), 15 deletions(-)
---
diff --git a/src/ekiga.cpp b/src/ekiga.cpp
index 68468c4..0842940 100644
--- a/src/ekiga.cpp
+++ b/src/ekiga.cpp
@@ -69,12 +69,6 @@ GnomeMeeting::GnomeMeeting ()
}
-GnomeMeeting::~GnomeMeeting()
-{
- Exit ();
-}
-
-
void
GnomeMeeting::Exit ()
{
diff --git a/src/ekiga.h b/src/ekiga.h
index 2d2cab4..9dc19fe 100644
--- a/src/ekiga.h
+++ b/src/ekiga.h
@@ -69,13 +69,6 @@ class GnomeMeeting : public PProcess
GnomeMeeting ();
- /* DESCRIPTION : Destructor.
- * BEHAVIOR :
- * PRE : /
- */
- ~GnomeMeeting ();
-
-
/* DESCRIPTION : /
* BEHAVIOR : Prepare the endpoint to exit by removing all
* associated threads and components.
diff --git a/src/gui/main_window.cpp b/src/gui/main_window.cpp
index 4d6b50b..bb61f6c 100644
--- a/src/gui/main_window.cpp
+++ b/src/gui/main_window.cpp
@@ -2370,7 +2370,7 @@ main (int argc,
/* Ekiga initialisation */
// should come *after* ptrace initialisation, to track codec loading for ex.
GnomeMeeting instance;
-
+ GnomeMeeting::Process ()->Exit ();
Ekiga::Runtime::init ();
engine_init (service_core, argc, argv);
@@ -2418,7 +2418,6 @@ main (int argc,
#endif
/* Exit Ekiga */
- GnomeMeeting::Process ()->Exit ();
service_core.reset ();
Ekiga::Runtime::quit ();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]