ekiga r6201 - in trunk: . lib/engine/gui/gtk-frontend src/endpoints
- From: dsandras svn gnome org
- To: svn-commits-list gnome org
- Subject: ekiga r6201 - in trunk: . lib/engine/gui/gtk-frontend src/endpoints
- Date: Tue, 15 Apr 2008 20:02:22 +0100 (BST)
Author: dsandras
Date: Tue Apr 15 20:02:21 2008
New Revision: 6201
URL: http://svn.gnome.org/viewvc/ekiga?rev=6201&view=rev
Log:
Fixed more cases with invalid call start and duration.
Modified:
trunk/ChangeLog
trunk/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp
trunk/src/endpoints/opal-call.cpp
Modified: trunk/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp
==============================================================================
--- trunk/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp (original)
+++ trunk/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp Tue Apr 15 20:02:21 2008
@@ -109,7 +109,9 @@
timeinfo = localtime (&t);
if (timeinfo != NULL) {
strftime (buffer, 80, "%x %X", timeinfo);
- info << buffer << " (" << hcontact->get_call_duration () << ")";
+ info << buffer;
+ if (!hcontact->get_call_duration ().empty ())
+ info << " (" << hcontact->get_call_duration () << ")";
}
else
info << hcontact->get_call_duration ();
Modified: trunk/src/endpoints/opal-call.cpp
==============================================================================
--- trunk/src/endpoints/opal-call.cpp (original)
+++ trunk/src/endpoints/opal-call.cpp Tue Apr 15 20:02:21 2008
@@ -216,7 +216,7 @@
{
std::stringstream duration;
- if (start_time.IsValid ()) {
+ if (start_time.IsValid () && IsEstablished ()) {
PTimeInterval t = PTime () - start_time;
@@ -252,6 +252,8 @@
app = (const char *) connection.GetRemoteApplication ();
uri = (const char *) connection.GetRemotePartyCallbackURL ();
start_time = connection.GetConnectionStartTime ();
+ if (!start_time.IsValid ())
+ start_time = PTime ();
if (!party_name.empty ())
remote_party_name = party_name;
@@ -304,6 +306,8 @@
*/
if (!PIsDescendant(&connection, OpalPCSSConnection)) {
+ parse_info (connection);
+
if (!IsEstablished ()
&& !is_outgoing ()
&& connection.GetCallEndReason () != OpalConnection::EndedByAnswerDenied) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]