ekiga r6354 - in trunk: . src/endpoints src/gui

[dsandras svn gnome org]

Author: dsandras
Date: Tue Jun  3 20:46:19 2008
New Revision: 6354
URL: http://svn.gnome.org/viewvc/ekiga?rev=6354&view=rev

Log:
Clear the GUI callbacks before exiting and thus deleting the engine.
Ensures no callback are executed with a bad timing.


Modified:
   trunk/ChangeLog
   trunk/src/endpoints/manager.cpp
   trunk/src/gui/callbacks.cpp

Modified: trunk/src/endpoints/manager.cpp
==============================================================================
--- trunk/src/endpoints/manager.cpp	(original)
+++ trunk/src/endpoints/manager.cpp	Tue Jun  3 20:46:19 2008
@@ -147,7 +147,7 @@
 
 GMManager::~GMManager ()
 {
-  ClearAllCalls (OpalConnection::EndedByLocalUser, TRUE);
+  ClearAllCalls (OpalConnection::EndedByLocalUser, false);
   RemoveAccountsEndpoint ();
 }
 

Modified: trunk/src/gui/callbacks.cpp
==============================================================================
--- trunk/src/gui/callbacks.cpp	(original)
+++ trunk/src/gui/callbacks.cpp	Tue Jun  3 20:46:19 2008
@@ -267,12 +267,6 @@
   GtkWidget *prefs_window = NULL;
   GtkWidget *accounts_window = NULL;
 
-  //gdk_threads_leave ();
-  Ekiga::ServiceCore *core = GnomeMeeting::Process ()->GetServiceCore ();
-  GMManager *manager = dynamic_cast<GMManager*> (core->get("opal-component"));
-  manager->ClearAllCalls ();
-  //gdk_threads_enter ();
-  
   main_window = GnomeMeeting::Process ()->GetMainWindow ();
   assistant_window = GnomeMeeting::Process ()->GetAssistantWindow (false);
   prefs_window = GnomeMeeting::Process ()->GetPrefsWindow (false);