ekiga r6896 - in trunk: . lib/engine/protocol/skel src/endpoints

[dsandras svn gnome org]

Author: dsandras
Date: Tue Sep  9 18:28:11 2008
New Revision: 6896
URL: http://svn.gnome.org/viewvc/ekiga?rev=6896&view=rev

Log:
Fixed #453239. Forgotten files.


Modified:
   trunk/ChangeLog
   trunk/lib/engine/protocol/skel/call.h
   trunk/src/endpoints/opal-call.cpp
   trunk/src/endpoints/opal-call.h

Modified: trunk/lib/engine/protocol/skel/call.h
==============================================================================
--- trunk/lib/engine/protocol/skel/call.h	(original)
+++ trunk/lib/engine/protocol/skel/call.h	Tue Sep  9 18:28:11 2008
@@ -112,6 +112,11 @@
        */
       virtual const std::string get_id () const = 0;
 
+      /** Return the local party name
+       * @return: the local party name
+       */
+      virtual const std::string get_local_party_name () const = 0;
+
       /** Return the remote party name
        * @return: the remote party name
        */

Modified: trunk/src/endpoints/opal-call.cpp
==============================================================================
--- trunk/src/endpoints/opal-call.cpp	(original)
+++ trunk/src/endpoints/opal-call.cpp	Tue Sep  9 18:28:11 2008
@@ -46,6 +46,7 @@
 #include <opal/manager.h>
 #include <opal/rtpconn.h>
 #include <opal/pcss.h>
+#include <sip/sippdu.h>
 
 #include "config.h"
 
@@ -219,6 +220,13 @@
 
 
 const std::string
+Opal::Call::get_local_party_name () const
+{
+  return local_party_name;
+}
+
+
+const std::string
 Opal::Call::get_remote_party_name () const
 {
   return remote_party_name;
@@ -277,7 +285,8 @@
   char special_chars [] = "([;=";
   int i = 0;
   std::string::size_type idx;
-  std::string party_name;
+  std::string l_party_name;
+  std::string r_party_name;
   std::string app;
 
   if (!PIsDescendant(&connection, OpalPCSSConnection)) {
@@ -289,14 +298,17 @@
     else
       remote_uri = (const char *) connection.GetRemotePartyCallbackURL ();
 
-    party_name = (const char *) connection.GetRemotePartyName ();
+    l_party_name = (const char *) connection.GetCalledPartyURL ();
+    r_party_name = (const char *) connection.GetRemotePartyName ();
     app = (const char *) connection.GetRemoteProductInfo ().AsString ();
     start_time = connection.GetConnectionStartTime ();
     if (!start_time.IsValid ())
       start_time = PTime ();
 
-    if (!party_name.empty ())
-      remote_party_name = party_name;
+    if (!l_party_name.empty ())
+      local_party_name = (const char *) SIPURL (l_party_name).GetUserName ();
+    if (!r_party_name.empty ())
+      remote_party_name = r_party_name;
     if (!app.empty ())
       remote_application = app;
 

Modified: trunk/src/endpoints/opal-call.h
==============================================================================
--- trunk/src/endpoints/opal-call.h	(original)
+++ trunk/src/endpoints/opal-call.h	Tue Sep  9 18:28:11 2008
@@ -115,6 +115,11 @@
      */
     const std::string get_id () const;
 
+    /** Return the local party name
+     * @return: the local party name
+     */
+    const std::string get_local_party_name () const;
+
     /** Return the remote party name
      * @return: the remote party name
      */
@@ -210,6 +215,7 @@
 
     bool call_setup;
     bool outgoing;
+    std::string local_party_name;
     std::string remote_party_name;
     std::string remote_uri;
     std::string remote_application;