ekiga r6320 - in trunk: . src/endpoints

[dsandras svn gnome org]

Author: dsandras
Date: Sun May 25 20:37:33 2008
New Revision: 6320
URL: http://svn.gnome.org/viewvc/ekiga?rev=6320&view=rev

Log:
Moved AddRouteEntry calls where appropriate, ie in the
CallProtocolManager itself.


Modified:
   trunk/ChangeLog
   trunk/src/endpoints/manager.cpp
   trunk/src/endpoints/opal-main.cpp
   trunk/src/endpoints/sip.cpp

Modified: trunk/src/endpoints/manager.cpp
==============================================================================
--- trunk/src/endpoints/manager.cpp	(original)
+++ trunk/src/endpoints/manager.cpp	Sun May 25 20:37:33 2008
@@ -140,7 +140,6 @@
   pcssEP->SetSoundChannelPlayDevice("EKIGA");
   pcssEP->SetSoundChannelRecordDevice("EKIGA");
   AddRouteEntry("h323:.* = pc:<db>");
-  AddRouteEntry("sip:.* = pc:<db>");
   protocols.push_back (h323EP->get_protocol_name ());
   protocols.push_back ("sip"); //FIXME
 

Modified: trunk/src/endpoints/opal-main.cpp
==============================================================================
--- trunk/src/endpoints/opal-main.cpp	(original)
+++ trunk/src/endpoints/opal-main.cpp	Sun May 25 20:37:33 2008
@@ -75,7 +75,6 @@
   GMManager *manager = new GMManager (core);
   GMSIPEndpoint *sipEP = new GMSIPEndpoint (*manager, core, sip_port);
 
-  manager->AddRouteEntry("pc:.* = sip:<da>");
   manager->add_protocol_manager (*sipEP);
 
   call_core->add_manager (*manager);

Modified: trunk/src/endpoints/sip.cpp
==============================================================================
--- trunk/src/endpoints/sip.cpp	(original)
+++ trunk/src/endpoints/sip.cpp	Sun May 25 20:37:33 2008
@@ -101,6 +101,10 @@
   /* Update the User Agent */
   SetUserAgent ("Ekiga/" PACKAGE_VERSION);
 
+  /* Ready to take calls */
+  AddRouteEntry("sip:.* = pc:<db>");
+  AddRouteEntry("pc:.* = sip:<da>");
+
   /* NAT Binding */
   SetNATBindingRefreshMethod (SIPEndPoint::EmptyRequest);