ekiga r6785 - in trunk: . src/endpoints

[dsandras svn gnome org]

Author: dsandras
Date: Mon Sep  1 20:06:42 2008
New Revision: 6785
URL: http://svn.gnome.org/viewvc/ekiga?rev=6785&view=rev

Log:
Moved the alerting notification (ringing) from pcss.cpp to the
Opal::Call object. That removes the ugly hack and we can make use of
emit_signal_in_main instead.


Modified:
   trunk/ChangeLog
   trunk/src/endpoints/opal-call.cpp
   trunk/src/endpoints/opal-call.h
   trunk/src/endpoints/pcss.cpp

Modified: trunk/src/endpoints/opal-call.cpp
==============================================================================
--- trunk/src/endpoints/opal-call.cpp	(original)
+++ trunk/src/endpoints/opal-call.cpp	Mon Sep  1 20:06:42 2008
@@ -497,6 +497,16 @@
 }
 
 
+PBoolean
+Opal::Call::OnAlerting (OpalConnection & connection)
+{
+  if (!PIsDescendant(&connection, OpalPCSSConnection))
+    runtime.emit_signal_in_main (ringing);
+
+  return OpalCall::OnAlerting (connection);
+}
+
+
 void 
 Opal::Call::OnHold (OpalConnection & /*connection*/, 
                     bool /*from_remote*/, 

Modified: trunk/src/endpoints/opal-call.h
==============================================================================
--- trunk/src/endpoints/opal-call.h	(original)
+++ trunk/src/endpoints/opal-call.h	Mon Sep  1 20:06:42 2008
@@ -183,6 +183,8 @@
 
     PBoolean OnSetUp (OpalConnection & connection);
 
+    PBoolean OnAlerting (OpalConnection & connection);
+
     PDECLARE_NOTIFIER (PThread, Opal::Call, OnAnswer);
 
     PDECLARE_NOTIFIER (PThread, Opal::Call, OnHangup);

Modified: trunk/src/endpoints/pcss.cpp
==============================================================================
--- trunk/src/endpoints/pcss.cpp	(original)
+++ trunk/src/endpoints/pcss.cpp	Mon Sep  1 20:06:42 2008
@@ -43,12 +43,6 @@
 
 #include "call.h"
 
-static void
-call_ringing_in_main (Ekiga::Call* call)
-{
-  call->ringing.emit ();
-}
-
 
 GMPCSSEndpoint::GMPCSSEndpoint (Opal::CallManager & ep,
                                 Ekiga::ServiceCore & _core) 
@@ -70,13 +64,7 @@
 }
 
 
-bool GMPCSSEndpoint::OnShowOutgoing (const OpalPCSSConnection &connection)
+bool GMPCSSEndpoint::OnShowOutgoing (const OpalPCSSConnection & /*connection*/)
 {
-  Ekiga::Call *call = dynamic_cast<Ekiga::Call *> (&connection.GetCall ());
-
-  if (call)
-    runtime.run_in_main (sigc::bind (sigc::ptr_fun (call_ringing_in_main),
-				     call));
-
   return true;
 }