ekiga r7441 - in trunk: . lib/engine/components/opal
- From: dsandras svn gnome org
- To: svn-commits-list gnome org
- Subject: ekiga r7441 - in trunk: . lib/engine/components/opal
- Date: Sun, 7 Dec 2008 15:42:53 +0000 (UTC)
Author: dsandras
Date: Sun Dec 7 15:42:53 2008
New Revision: 7441
URL: http://svn.gnome.org/viewvc/ekiga?rev=7441&view=rev
Log:
Fixed GetRegisteredPartyName so that it uses
GetDefaultRegisteredPartyName when Ekiga.net is not being used.
Adapted to new OPAL API.
Modified:
trunk/ChangeLog
trunk/lib/engine/components/opal/sip-endpoint.cpp
trunk/lib/engine/components/opal/sip-endpoint.h
Modified: trunk/lib/engine/components/opal/sip-endpoint.cpp
==============================================================================
--- trunk/lib/engine/components/opal/sip-endpoint.cpp (original)
+++ trunk/lib/engine/components/opal/sip-endpoint.cpp Sun Dec 7 15:42:53 2008
@@ -998,7 +998,7 @@
}
-SIPURL Opal::Sip::EndPoint::GetRegisteredPartyName (const SIPURL & host)
+SIPURL Opal::Sip::EndPoint::GetRegisteredPartyName (const SIPURL & host, const OpalTransport & transport)
{
PString local_address;
PIPSocket::Address address;
@@ -1032,15 +1032,7 @@
/* As a last resort, ie not registered to host, no default account or
* dialog with a local peer, then use the local address
*/
- local_address = GetListeners()[0].GetLocalAddress();
-
- PINDEX j = local_address.Find ('$');
- if (j != P_MAX_INDEX)
- local_address = local_address.Mid (j+1);
- SIPURL myself =
- SIPURL ("\"" + GetDefaultDisplayName () + "\" <" + PString ("sip:") + GetDefaultLocalPartyName() + "@" + local_address + ";transport=udp>");
-
- return myself;
+ return GetDefaultRegisteredPartyName (transport);
}
Modified: trunk/lib/engine/components/opal/sip-endpoint.h
==============================================================================
--- trunk/lib/engine/components/opal/sip-endpoint.h (original)
+++ trunk/lib/engine/components/opal/sip-endpoint.h Sun Dec 7 15:42:53 2008
@@ -161,7 +161,7 @@
void OnMessageFailed (const SIPURL & messageUrl,
SIP_PDU::StatusCodes reason);
- SIPURL GetRegisteredPartyName (const SIPURL & host);
+ SIPURL GetRegisteredPartyName (const SIPURL & host, const OpalTransport & transport);
/* Callbacks */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]