ekiga r6392 - in trunk: . src/endpoints

[dsandras svn gnome org]

Author: dsandras
Date: Fri Jun 20 09:31:42 2008
New Revision: 6392
URL: http://svn.gnome.org/viewvc/ekiga?rev=6392&view=rev

Log:
Fixed compilation with OPAL Trunk thanks to Eugen Dedu.


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

Modified: trunk/src/endpoints/sip.cpp
==============================================================================
--- trunk/src/endpoints/sip.cpp	(original)
+++ trunk/src/endpoints/sip.cpp	Fri Jun 20 09:31:42 2008
@@ -805,8 +805,8 @@
     msgData.SetAt (SIPURL (from).AsString (), val);
 
     SIPURL uri = from;
+    uri.Sanitise (SIPURL::FromURI);
     std::string display_name = (const char *) uri.GetDisplayName ();
-    uri.AdjustForRequestURI ();
     std::string message_uri = (const char *) uri.AsString ();
     std::string _message = (const char *) pdu.GetEntityBody ();
 
@@ -819,7 +819,7 @@
                                            SIP_PDU::StatusCodes /*reason*/)
 {
   SIPURL to = messageUrl;
-  to.AdjustForRequestURI ();
+  to.Sanitise (SIPURL::ToURI);
   std::string uri = (const char *) to.AsString ();
   runtime.run_in_main (sigc::bind (im_failed.make_slot (), uri, 
                                    _("Could not send message")));
@@ -892,10 +892,6 @@
   std::string status;
   std::string presence = "presence-unknown";
 
-  SIPURL sip_uri = SIPURL (user);
-  sip_uri.AdjustForRequestURI ();
-  std::string _uri = sip_uri.AsString ();
-
   if (b.Find ("Closed") != P_MAX_INDEX)
     presence = "presence-offline";
   else
@@ -916,6 +912,10 @@
   if ((j = s.Find (" - ")) != P_MAX_INDEX)
     status = (const char *) note.Mid (j + 3);
 
+  SIPURL sip_uri = SIPURL (user);
+  sip_uri.Sanitise (SIPURL::ExternalURI);
+  std::string _uri = sip_uri.AsString ();
+
   /**
    * TODO
    * Wouldn't it be convenient to emit the signal and have the presence core listen to it ?