ekiga r5869 - in trunk: . src/gui

[dsandras svn gnome org]

Author: dsandras
Date: Sun Jan  6 18:18:18 2008
New Revision: 5869
URL: http://svn.gnome.org/viewvc/ekiga?rev=5869&view=rev

Log:
Minor improvements.


Modified:
   trunk/ChangeLog
   trunk/src/gui/callbacks.cpp
   trunk/src/gui/main.cpp

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	(original)
+++ trunk/ChangeLog	Sun Jan  6 18:18:18 2008
@@ -1,5 +1,10 @@
 2008-01-06  Damien Sandras  <dsandras gnome org>
 
+	* src/gui/main.cpp, src/gui/callbacks.cpp: 
+	Minor improvements.
+
+2008-01-06  Damien Sandras  <dsandras gnome org>
+
 	* src/gui/preferences.cpp:
 	Separated audio and video codecs configuration. Regrouped codecs and
 	devices under the same section.

Modified: trunk/src/gui/callbacks.cpp
==============================================================================
--- trunk/src/gui/callbacks.cpp	(original)
+++ trunk/src/gui/callbacks.cpp	Sun Jan  6 18:18:18 2008
@@ -250,6 +250,7 @@
   gdk_threads_leave ();
   Ekiga::ServiceCore *core = GnomeMeeting::Process ()->GetServiceCore ();
   GMManager *manager = dynamic_cast<GMManager*> (core->get("opal-component"));
+  manager->ClearAllCalls ();
   manager->RemoveVideoGrabber ();
   gdk_threads_enter ();
   

Modified: trunk/src/gui/main.cpp
==============================================================================
--- trunk/src/gui/main.cpp	(original)
+++ trunk/src/gui/main.cpp	Sun Jan  6 18:18:18 2008
@@ -591,7 +591,8 @@
                            mw->current_call->get_received_video_framerate ());
     gdk_threads_enter ();
     gm_main_window_push_info_message (GTK_WIDGET (self), msg);
-    gm_main_window_set_call_duration (GTK_WIDGET (self), mw->current_call->get_call_duration ().c_str ());
+    if (mw->current_call)
+      gm_main_window_set_call_duration (GTK_WIDGET (self), mw->current_call->get_call_duration ().c_str ());
     gdk_threads_leave ();
 
     g_free (msg);
@@ -1099,6 +1100,7 @@
   if (mw->current_call) {
 
     mw->current_call->hangup ();
+    mw->current_call = NULL;
   }
 }