ekiga r6342 - in trunk: . src/endpoints

[dsandras svn gnome org]

Author: dsandras
Date: Sun Jun  1 17:19:04 2008
New Revision: 6342
URL: http://svn.gnome.org/viewvc/ekiga?rev=6342&view=rev

Log:
Fixed Ekiga so it compiles with the new OPAL API.


Modified:
   trunk/ChangeLog
   trunk/src/endpoints/manager.cpp
   trunk/src/endpoints/manager.h
   trunk/src/endpoints/sip.cpp
   trunk/src/endpoints/sip.h

Modified: trunk/src/endpoints/manager.cpp
==============================================================================
--- trunk/src/endpoints/manager.cpp	(original)
+++ trunk/src/endpoints/manager.cpp	Sun Jun  1 17:19:04 2008
@@ -696,6 +696,18 @@
 }
 
 
+void 
+GMManager::OnMWIReceived (const PString & account,
+                          MessageWaitingType /*type*/,
+                          const PString & msgs)
+{
+  runtime.run_in_main (sigc::bind (mwi_event.make_slot (), 
+                                   (const char *) account, 
+                                   (const char *) msgs));
+}
+
+
+
 void GMManager::GetAllowedFormats (OpalMediaFormatList & full_list)
 {
   OpalMediaFormatList list = OpalTranscoder::GetPossibleFormats (pcssEP->GetMediaFormats ());

Modified: trunk/src/endpoints/manager.h
==============================================================================
--- trunk/src/endpoints/manager.h	(original)
+++ trunk/src/endpoints/manager.h	Sun Jun  1 17:19:04 2008
@@ -173,11 +173,14 @@
 
   void RemoveAccountsEndpoint ();
 
-  virtual bool OnOpenMediaStream (OpalConnection &,
-				  OpalMediaStream &);
+  bool OnOpenMediaStream (OpalConnection &,
+                          OpalMediaStream &);
 
-  virtual void OnClosedMediaStream (const OpalMediaStream &);
+  void OnClosedMediaStream (const OpalMediaStream &);
 
+  void OnMWIReceived (const PString & party,
+                      MessageWaitingType type,
+                      const PString & info);
 
   void GetAllowedFormats (OpalMediaFormatList & full_list);
 

Modified: trunk/src/endpoints/sip.cpp
==============================================================================
--- trunk/src/endpoints/sip.cpp	(original)
+++ trunk/src/endpoints/sip.cpp	Sun Jun  1 17:19:04 2008
@@ -253,7 +253,7 @@
 
     data += "</tuple>\r\n";
     data += "</presence>\r\n";
-    Publish (to.c_str (), data, 500); // TODO: allow to change the 500 
+    Publish (to.c_str (), data, 120); // TODO: allow to change the 500 
   }
 }
 
@@ -785,17 +785,6 @@
 
 
 void 
-GMSIPEndpoint::OnMWIReceived (const PString & account,
-                              G_GNUC_UNUSED SIPSubscribe::MWIType type,
-                              const PString & msgs)
-{
-  runtime.run_in_main (sigc::bind (endpoint.mwi_event.make_slot (), 
-                                   (const char *) account, 
-                                   (const char *) msgs));
-}
-
-
-void 
 GMSIPEndpoint::OnReceivedMESSAGE (G_GNUC_UNUSED OpalTransport & transport,
                                   SIP_PDU & pdu)
 {

Modified: trunk/src/endpoints/sip.h
==============================================================================
--- trunk/src/endpoints/sip.h	(original)
+++ trunk/src/endpoints/sip.h	Sun Jun  1 17:19:04 2008
@@ -133,10 +133,6 @@
                              unsigned options,
                              OpalConnection::StringOptions * stroptions);
 
-  void OnMWIReceived (const PString & to,
-                      SIPSubscribe::MWIType type,
-                      const PString & msgs);
-
   virtual void OnPresenceInfoReceived (const PString & user,
                                        const PString & basic,
                                        const PString & note);