[ekiga] Call Window: Fixed call hangup.



commit c4840276f7cb8072b4ce7e93604618123a45abba
Author: Damien Sandras <dsandras beip be>
Date:   Sun Mar 25 11:32:33 2012 +0200

    Call Window: Fixed call hangup.
    
    It was impossible to disconnect any call that was not already
    established.

 src/gui/call_window.cpp |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)
---
diff --git a/src/gui/call_window.cpp b/src/gui/call_window.cpp
index 208022f..efc89f9 100644
--- a/src/gui/call_window.cpp
+++ b/src/gui/call_window.cpp
@@ -1083,10 +1083,23 @@ on_setup_call_cb (G_GNUC_UNUSED boost::shared_ptr<Ekiga::CallManager> manager,
 {
   EkigaCallWindow *cw = EKIGA_CALL_WINDOW (self);
 
-  gtk_window_set_title (GTK_WINDOW (cw), call->get_remote_party_name ().c_str ());
+  if (!call->is_outgoing () && !manager->get_auto_answer ()) {
+    if (cw->priv->current_call)
+      return; // No call setup needed if already in a call
+
+    cw->priv->current_call = call;
+    cw->priv->calling_state = Called;
+  }
+  else {
+
+    cw->priv->current_call = call;
+    cw->priv->calling_state = Calling;
+  }
+
+  gtk_window_set_title (GTK_WINDOW (cw), call->get_remote_uri ().c_str ());
 
   if (call->is_outgoing ())
-    ekiga_call_window_set_status (cw, _("Calling %s..."), call->get_remote_party_name ().c_str ());
+    ekiga_call_window_set_status (cw, _("Calling %s..."), call->get_remote_uri ().c_str ());
 
   ekiga_call_window_update_calling_state (cw, Calling);
 }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]