ekiga r6827 - in trunk: . lib/engine/account/skel src/endpoints src/gui

[dsandras svn gnome org]

Author: dsandras
Date: Thu Sep  4 20:36:01 2008
New Revision: 6827
URL: http://svn.gnome.org/viewvc/ekiga?rev=6827&view=rev

Log:
Fixed account registering/unregistering. Fixed unregistering of Opal
accounts when being removed.


Modified:
   trunk/ChangeLog
   trunk/lib/engine/account/skel/bank-impl.h
   trunk/src/endpoints/opal-account.cpp
   trunk/src/endpoints/opal-bank.cpp
   trunk/src/gui/accounts.cpp

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	Thu Sep  4 20:36:01 2008
@@ -303,7 +303,6 @@
 void
 Ekiga::BankImpl<T>::remove_account (T &account)
 {
-  account_core->unsubscribe_account (account);
   remove_object (account);
 }
 

Modified: trunk/src/endpoints/opal-account.cpp
==============================================================================
--- trunk/src/endpoints/opal-account.cpp	(original)
+++ trunk/src/endpoints/opal-account.cpp	Thu Sep  4 20:36:01 2008
@@ -284,8 +284,12 @@
 
 void Opal::Account::remove ()
 {
+  enabled = false;
   dead = true;
 
+  Ekiga::AccountCore *account_core = dynamic_cast<Ekiga::AccountCore*>(core.get ("account-core"));
+  account_core->unsubscribe_account (*this);
+
   trigger_saving.emit ();
 
   removed.emit ();

Modified: trunk/src/endpoints/opal-bank.cpp
==============================================================================
--- trunk/src/endpoints/opal-bank.cpp	(original)
+++ trunk/src/endpoints/opal-bank.cpp	Thu Sep  4 20:36:01 2008
@@ -194,6 +194,5 @@
                       unsigned timeout)
 {
   Opal::Account *account = new Opal::Account (core, t, name, host, user, auth_user, password, enabled, timeout);
-
   add_account (*account);
 }

Modified: trunk/src/gui/accounts.cpp
==============================================================================
--- trunk/src/gui/accounts.cpp	(original)
+++ trunk/src/gui/accounts.cpp	Thu Sep  4 20:36:01 2008
@@ -333,15 +333,10 @@
                         COLUMN_ACCOUNT, &account,
                         -1);
 
-    if (fixed) {
-
-      if (account->is_active ()) {
-        account->disable ();
-      }
-    }
-    else if (!account->is_active ()) {
+    if (fixed)
+      account->disable ();
+    else 
       account->enable ();
-    }
 
     gtk_list_store_set (GTK_LIST_STORE (model), &iter,
                         COLUMN_ACCOUNT_ENABLED, fixed^1,