ekiga r6814 - in trunk: . lib/engine/account/skel

[dsandras svn gnome org]

Author: dsandras
Date: Wed Sep  3 21:25:32 2008
New Revision: 6814
URL: http://svn.gnome.org/viewvc/ekiga?rev=6814&view=rev

Log:
Unsubscribe account when removing.


Modified:
   trunk/ChangeLog
   trunk/lib/engine/account/skel/account-core.h
   trunk/lib/engine/account/skel/bank-impl.h

Modified: trunk/lib/engine/account/skel/account-core.h
==============================================================================
--- trunk/lib/engine/account/skel/account-core.h	(original)
+++ trunk/lib/engine/account/skel/account-core.h	Wed Sep  3 21:25:32 2008
@@ -230,9 +230,6 @@
 template<class T>
 bool Ekiga::AccountCore::subscribe_account (const T &account)
 {
-  if (!account.is_enabled ())
-    return false;
-
   for (subscriber_iterator iter = account_subscribers.begin ();
        iter != account_subscribers.end ();
        iter++) {
@@ -250,9 +247,6 @@
 template<class T>
 bool Ekiga::AccountCore::unsubscribe_account (const T &account)
 {
-  if (account.is_enabled ())
-    return false;
-
   for (subscriber_iterator iter = account_subscribers.begin ();
        iter != account_subscribers.end ();
        iter++) {

Modified: trunk/lib/engine/account/skel/bank-impl.h
==============================================================================
--- trunk/lib/engine/account/skel/bank-impl.h	(original)
+++ trunk/lib/engine/account/skel/bank-impl.h	Wed Sep  3 21:25:32 2008
@@ -296,6 +296,7 @@
   account.questions.add_handler (questions.make_slot ());
   account.trigger_saving.connect (sigc::mem_fun (this, &Ekiga::BankImpl<T>::save));
   account.registration_event.connect (sigc::bind (sigc::mem_fun (this, &Ekiga::BankImpl<T>::on_registration_event), &account));
+  account.removed.connect (sigc::bind (sigc::mem_fun (this, &Ekiga::BankImpl<T>::remove_account), account));
 }
 
 
@@ -303,6 +304,7 @@
 void
 Ekiga::BankImpl<T>::remove_account (T &account)
 {
+  account_core->unsubscribe_account (account);
   remove_object (account);
 }