ekiga r6571 - in trunk: . src/endpoints

[dsandras svn gnome org]

Author: dsandras
Date: Mon Aug 11 18:50:01 2008
New Revision: 6571
URL: http://svn.gnome.org/viewvc/ekiga?rev=6571&view=rev

Log:
Only propose default accounts as possible accounts when dialing a
contact (for example from the evolution-data-server back-end).


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	Mon Aug 11 18:50:01 2008
@@ -211,7 +211,7 @@
            it != bank->end ();
            it++) {
 
-        if (it->get_protocol_name () == "SIP" && it->is_enabled ()) {
+        if (it->get_protocol_name () == "SIP" && it->is_active ()) {
 
           std::stringstream uristr;
           std::string str = uri;
@@ -644,7 +644,7 @@
   /* Signal */
   Ekiga::Account *account = account_core.find_account (strm.str ());
   if (account)
-    runtime.run_in_main (sigc::bind (registration_event.make_slot (), account,
+    runtime.run_in_main (sigc::bind (account->registration_event.make_slot (),
                                      was_registering ? Ekiga::AccountCore::Registered : Ekiga::AccountCore::Unregistered,
                                      std::string ()));
 }
@@ -876,7 +876,7 @@
   /* Signal */
   Ekiga::Account *account = account_core.find_account (strm.str ());
   if (account)
-    runtime.run_in_main (sigc::bind (registration_event.make_slot (), account,
+    runtime.run_in_main (sigc::bind (account->registration_event.make_slot (),
                                      wasRegistering ? Ekiga::AccountCore::RegistrationFailed : Ekiga::AccountCore::UnregistrationFailed,
                                      info));
 }