From 773e1fa6f8aced4e4c31e2a5f85e6478b8a02412 Mon Sep 17 00:00:00 2001
From: Damian Minkov <damencho@jitsi.org>
Date: Fri, 23 Nov 2012 16:17:37 +0000
Subject: [PATCH] Adds support for protocol providers without wizards. Patch
 contributed by Tom Denham.

---
 resources/languages/resources.properties      |  1 +
 .../account/AccountsConfigurationPanel.java   | 40 ++++++++++++++-----
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/resources/languages/resources.properties b/resources/languages/resources.properties
index 5073f6d78..a5fe56afc 100644
--- a/resources/languages/resources.properties
+++ b/resources/languages/resources.properties
@@ -527,6 +527,7 @@ service.gui.UPDATE=Update
 service.gui.MOBILE_PHONE=Mobile
 service.gui.WORK_PHONE=Work
 service.gui.PHONE=Home
+service.gui.EDIT_NOT_SUPPORTED=Editing this account is not supported
 
 service.gui.ZID_NAME_SET=ZRTP identifier's name:
 service.gui.ZID_NAME_NOT_SET=ZRTP identifier name is not set.
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 edf755466..4b9abec2b 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
@@ -19,11 +19,12 @@
 import net.java.sip.communicator.util.swing.*;
 
 import org.jitsi.service.configuration.*;
+import org.jitsi.service.resources.*;
 
 /**
  * The <tt>AccountsConfigurationPanel</tt> is the panel containing the accounts
  * list and according buttons shown in the options form.
- * 
+ *
  * @author Yana Stamcheva
  * @author Lubomir Marinov
  */
@@ -171,11 +172,13 @@ else if (sourceButton.equals(removeButton))
                             = (AccountRegWizardContainerImpl) GuiActivator
                                 .getUIService().getAccountRegWizardContainer();
 
-                        AccountRegistrationWizard wizard
-                            = wizardContainer.getProtocolWizard(
-                                    account.getProtocolProvider());
+                        ProtocolProviderService protocolProvider =
+                                                  account.getProtocolProvider();
+                        AccountRegistrationWizard wizard =
+                            wizardContainer.getProtocolWizard(protocolProvider);
 
-                        wizard.accountRemoved(account.getProtocolProvider());
+                        if (wizard != null)
+                            wizard.accountRemoved(protocolProvider);
                     }
                 }
             }
@@ -191,17 +194,34 @@ else if (sourceButton.equals(editButton))
                 (AccountRegWizardContainerImpl) GuiActivator.getUIService()
                     .getAccountRegWizardContainer();
 
-            wizard.setTitle(GuiActivator.getResources().getI18NString(
-                "service.gui.ACCOUNT_REGISTRATION_WIZARD"));
+            AccountRegistrationWizard protocolWizard =
+                        wizard.getProtocolWizard(account.getProtocolProvider());
+
+            ResourceManagementService resources = GuiActivator.getResources();
+            if (protocolWizard != null)
+            {
+                wizard.setTitle(resources.getI18NString(
+                                    "service.gui.ACCOUNT_REGISTRATION_WIZARD"));
 
-            wizard.modifyAccount(account.getProtocolProvider());
-            wizard.showDialog(false);
+                wizard.modifyAccount(account.getProtocolProvider());
+                wizard.showDialog(false);
+            }
+            else
+            {
+                // There is no wizard for this account - just show an error
+                // dialog:
+                String title = resources.getI18NString("service.gui.ERROR");
+                String message =
+                      resources.getI18NString("service.gui.EDIT_NOT_SUPPORTED");
+                ErrorDialog dialog = new ErrorDialog(null, title, message);
+                dialog.setVisible(true);
+            }
         }
     }
 
     /**
      * Returns the edit button.
-     * 
+     *
      * @return the edit button
      */
     public JButton getEditButton()