ekiga r6656 - in trunk: . src/endpoints

[dsandras svn gnome org]

Author: dsandras
Date: Tue Aug 19 21:19:24 2008
New Revision: 6656
URL: http://svn.gnome.org/viewvc/ekiga?rev=6656&view=rev

Log:
Only add default targets to call and message if there is no @ and we
are dealing with sip uris. Otherwise SIP accounts could be proposed as
dial uris for h323 urls.


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

Modified: trunk/src/endpoints/sip-endpoint.cpp
==============================================================================
--- trunk/src/endpoints/sip-endpoint.cpp	(original)
+++ trunk/src/endpoints/sip-endpoint.cpp	Tue Aug 19 21:19:24 2008
@@ -219,7 +219,8 @@
   std::list<std::string> uris;
   std::list<std::string> accounts;
 
-  if (uri.find ("@") == string::npos) {
+  if ((uri.find ("sip:") == 0 || uri.find (":") == string::npos) 
+      && uri.find ("@") == string::npos) {
     
     Opal::Bank *bank = dynamic_cast<Opal::Bank*> (core.get ("opal-account-store"));
 
@@ -418,7 +419,7 @@
     else
       ustr << uri;
 
-    new dialer (ustr.str (), manager);
+    new Opal::Sip::dialer (ustr.str (), manager);
 
     return true;
   }