ekiga r6228 - in trunk: . src/endpoints

[dsandras svn gnome org]

Author: dsandras
Date: Sun Apr 27 10:43:17 2008
New Revision: 6228
URL: http://svn.gnome.org/viewvc/ekiga?rev=6228&view=rev

Log:
Moved OnHold callback from GMManager to Opal::Call now that I added a
method for it in the OpalCall class in OPAL.


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

Modified: trunk/src/endpoints/manager.cpp
==============================================================================
--- trunk/src/endpoints/manager.cpp	(original)
+++ trunk/src/endpoints/manager.cpp	Sun Apr 27 10:43:17 2008
@@ -787,12 +787,6 @@
 }
 
 
-void GMManager::OnHold (OpalConnection & connection)
-{
-  dynamic_cast <Opal::Call &> (connection.GetCall ()).OnHold (connection.IsConnectionOnHold ());
-}
-
-
 void
 GMManager::OnMWIReceived (const PString & account,
                           const PString & mwi)

Modified: trunk/src/endpoints/manager.h
==============================================================================
--- trunk/src/endpoints/manager.h	(original)
+++ trunk/src/endpoints/manager.h	Sun Apr 27 10:43:17 2008
@@ -310,8 +310,6 @@
                              bool wasRegistering,
                              std::string info);
 
-  void OnHold (OpalConnection & connection);
-
  private:
   void GetAllowedFormats (OpalMediaFormatList & full_list);
 

Modified: trunk/src/endpoints/opal-call.cpp
==============================================================================
--- trunk/src/endpoints/opal-call.cpp	(original)
+++ trunk/src/endpoints/opal-call.cpp	Sun Apr 27 10:43:17 2008
@@ -436,8 +436,7 @@
 }
 
 
-void
-Opal::Call::OnHold (bool on_hold)
+void Opal::Call::OnHold (OpalConnection & connection, bool from_remote, bool on_hold)
 {
   if (on_hold)
     runtime.run_in_main (held.make_slot ());

Modified: trunk/src/endpoints/opal-call.h
==============================================================================
--- trunk/src/endpoints/opal-call.h	(original)
+++ trunk/src/endpoints/opal-call.h	Sun Apr 27 10:43:17 2008
@@ -151,7 +151,7 @@
     /*
      * Opal Callbacks
      */
-    void OnHold (bool on_hold);
+    void OnHold (OpalConnection & connection, bool from_remote, bool on_hold);
 
     void OnOpenMediaStream (OpalMediaStream & stream);