[ekiga] Remove obsolete workaround for old SER



commit 5e1857b6cb9510a35b4c1ec8abb0f5d9a392e9d3
Author: Eugen Dedu <Eugen Dedu pu-pm univ-fcomte fr>
Date:   Wed Jul 13 20:46:37 2011 +0200

    Remove obsolete workaround for old SER
    
    This fixes IM in that only the 1st message received from myself was
    shown, all the others were not shown.

 lib/engine/components/opal/sip-endpoint.cpp |   23 ++++++-----------------
 lib/engine/components/opal/sip-endpoint.h   |    6 ------
 2 files changed, 6 insertions(+), 23 deletions(-)
---
diff --git a/lib/engine/components/opal/sip-endpoint.cpp b/lib/engine/components/opal/sip-endpoint.cpp
index d01f4e9..6b96346 100644
--- a/lib/engine/components/opal/sip-endpoint.cpp
+++ b/lib/engine/components/opal/sip-endpoint.cpp
@@ -867,9 +867,6 @@ bool
 Opal::Sip::EndPoint::OnReceivedMESSAGE (OpalTransport & transport,
 					SIP_PDU & pdu)
 {
-  PString *last = NULL;
-  PString *val = NULL;
-
   PString from = pdu.GetMIME().GetFrom();
   PINDEX j = from.Find (';');
   if (j != P_MAX_INDEX)
@@ -878,21 +875,13 @@ Opal::Sip::EndPoint::OnReceivedMESSAGE (OpalTransport & transport,
   if (j != P_MAX_INDEX && from.Find ('>') == P_MAX_INDEX)
     from += '>';
 
-  PWaitAndSignal m(msgDataMutex);
-  last = msgData.GetAt (SIPURL (from).AsString ());
-  if (!last || *last != pdu.GetMIME ().GetFrom ()) {
-
-    val = new PString (pdu.GetMIME ().GetFrom ());
-    msgData.SetAt (SIPURL (from).AsString (), val);
+  SIPURL uri = from;
+  uri.Sanitise (SIPURL::RequestURI);
+  std::string display_name = (const char *) uri.GetDisplayName ();
+  std::string message_uri = (const char *) uri.AsString ();
+  std::string _message = (const char *) pdu.GetEntityBody ();
 
-    SIPURL uri = from;
-    uri.Sanitise (SIPURL::RequestURI);
-    std::string display_name = (const char *) uri.GetDisplayName ();
-    std::string message_uri = (const char *) uri.AsString ();
-    std::string _message = (const char *) pdu.GetEntityBody ();
-
-    Ekiga::Runtime::run_in_main (boost::bind (&Opal::Sip::EndPoint::push_message_in_main, this, message_uri, display_name, _message));
-  }
+  Ekiga::Runtime::run_in_main (boost::bind (&Opal::Sip::EndPoint::push_message_in_main, this, message_uri, display_name, _message));
 
   return SIPEndPoint::OnReceivedMESSAGE (transport, pdu);
 }
diff --git a/lib/engine/components/opal/sip-endpoint.h b/lib/engine/components/opal/sip-endpoint.h
index d254bde..7bdd1ac 100644
--- a/lib/engine/components/opal/sip-endpoint.h
+++ b/lib/engine/components/opal/sip-endpoint.h
@@ -53,9 +53,6 @@
 
 #include "opal-call-manager.h"
 
-PDICTIONARY (msgDict, PString, PString);
-
-
 namespace Opal {
 
   namespace Sip {
@@ -206,9 +203,6 @@ namespace Opal {
       void mwi_received_in_main (const std::string aor,
 				 const std::string info);
 
-      PMutex msgDataMutex;
-      msgDict msgData;
-
       PMutex aorMutex;
       std::map<std::string, std::string> accounts;
 



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