ekiga r6764 - in trunk: . src/endpoints

[dsandras svn gnome org]

Author: dsandras
Date: Sun Aug 31 18:39:42 2008
New Revision: 6764
URL: http://svn.gnome.org/viewvc/ekiga?rev=6764&view=rev

Log:
Various fixes and cleanups.


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

Modified: trunk/src/endpoints/opal-call.cpp
==============================================================================
--- trunk/src/endpoints/opal-call.cpp	(original)
+++ trunk/src/endpoints/opal-call.cpp	Sun Aug 31 18:39:42 2008
@@ -274,7 +274,7 @@
 void
 Opal::Call::parse_info (OpalConnection & connection)
 {
-  char special_chars [] = "([@";
+  char special_chars [] = "([;=";
   int i = 0;
   std::string::size_type idx;
   std::string party_name;
@@ -288,9 +288,6 @@
       remote_uri = (const char *) connection.GetCall().GetPartyB ();
     else
       remote_uri = (const char *) connection.GetRemotePartyCallbackURL ();
-  }
-
-  if (!PIsDescendant(&connection, OpalPCSSConnection)) {
 
     party_name = (const char *) connection.GetRemotePartyName ();
     app = (const char *) connection.GetRemoteApplication ();
@@ -313,6 +310,9 @@
       if (idx != std::string::npos)
         remote_application = remote_application.substr (0, idx);
 
+      idx = remote_uri.find_first_of (special_chars [i]);
+      if (idx != std::string::npos)
+        remote_uri = remote_uri.substr (0, idx);
       i++;
     }
   }