From 4d6b5e76a0024453e4c5bb2d275c6314132d4b8d Mon Sep 17 00:00:00 2001
From: Yana Stamcheva <yana@jitsi.org>
Date: Mon, 28 Mar 2011 18:09:24 +0000
Subject: Move the acountRemoved notify after account is really removed.

---
 .../main/account/AccountsConfigurationPanel.java   | 23 +++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/net/java/sip/communicator/impl/gui/main/account/AccountsConfigurationPanel.java b/src/net/java/sip/communicator/impl/gui/main/account/AccountsConfigurationPanel.java
index eb65618..ec5f513 100644
--- a/src/net/java/sip/communicator/impl/gui/main/account/AccountsConfigurationPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/account/AccountsConfigurationPanel.java
@@ -121,17 +121,6 @@ public class AccountsConfigurationPanel
 
             AccountID accountID = account.getAccountID();
 
-            // Notify the corresponding wizard that the account would be removed.
-            AccountRegWizardContainerImpl wizardContainer =
-                (AccountRegWizardContainerImpl) GuiActivator.getUIService()
-                    .getAccountRegWizardContainer();
-
-            AccountRegistrationWizard wizard
-                = wizardContainer.getProtocolWizard(
-                        account.getProtocolProvider());
-
-            wizard.accountRemoved(account.getProtocolProvider());
-
             ProtocolProviderFactory providerFactory =
                 GuiActivator.getProtocolProviderFactory(
                     accountID.getProtocolName());
@@ -172,6 +161,18 @@ public class AccountsConfigurationPanel
                     if (isUninstalled)
                     {
                         accountList.ensureAccountRemoved(accountID);
+
+                        // Notify the corresponding wizard that the account
+                        // would be removed.
+                        AccountRegWizardContainerImpl wizardContainer
+                            = (AccountRegWizardContainerImpl) GuiActivator
+                                .getUIService().getAccountRegWizardContainer();
+
+                        AccountRegistrationWizard wizard
+                            = wizardContainer.getProtocolWizard(
+                                    account.getProtocolProvider());
+
+                        wizard.accountRemoved(account.getProtocolProvider());
                     }
                 }
             }
-- 
cgit v1.1