ekiga r6662 - in trunk: . src/endpoints

[dsandras svn gnome org]

Author: dsandras
Date: Wed Aug 20 19:27:28 2008
New Revision: 6662
URL: http://svn.gnome.org/viewvc/ekiga?rev=6662&view=rev

Log:
Fixed logic so that h323 presentities are not called using sip.


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

Modified: trunk/src/endpoints/opal-main.cpp
==============================================================================
--- trunk/src/endpoints/opal-main.cpp	(original)
+++ trunk/src/endpoints/opal-main.cpp	Wed Aug 20 19:27:28 2008
@@ -109,15 +109,19 @@
   // Add the bank of accounts when the CallManager is ready
   call_manager->ready.connect (sigc::bind (sigc::ptr_fun (on_call_manager_ready_cb), &core));
 
-  if (contact_core != NULL) 
+  if (contact_core != NULL) { 
+
     contact_core->add_contact_decorator (*sip_manager);
+    contact_core->add_contact_decorator (*h323_manager);
+  }
   else
     return false;
 
   if (presence_core != NULL) {
 
     presence_core->add_presentity_decorator (*sip_manager);
-    presence_core->add_supported_uri (sigc::ptr_fun (is_supported_address));
+    presence_core->add_presentity_decorator (*h323_manager);
+    presence_core->add_supported_uri (sigc::ptr_fun (is_supported_address)); //FIXME
 
     presence_core->add_presence_fetcher (*sip_manager);
     presence_core->add_presence_publisher (*sip_manager);

Modified: trunk/src/endpoints/sip-endpoint.cpp
==============================================================================
--- trunk/src/endpoints/sip-endpoint.cpp	(original)
+++ trunk/src/endpoints/sip-endpoint.cpp	Wed Aug 20 19:27:28 2008
@@ -219,9 +219,11 @@
   std::list<std::string> uris;
   std::list<std::string> accounts;
 
-  if ((uri.find ("sip:") == 0 || uri.find (":") == string::npos) 
-      && uri.find ("@") == string::npos) {
-    
+  if (!(uri.find ("sip:") == 0 || uri.find (":") == string::npos))
+    return false;
+
+  if (uri.find ("@") == string::npos) {
+
     Opal::Bank *bank = dynamic_cast<Opal::Bank*> (core.get ("opal-account-store"));
 
     if (bank) {