Update Felix to 3.2.2

4 files changed, 20 insertions, 6 deletions

diff --git a/src/net/java/sip/communicator/plugin/advancedconfig/AdvancedConfigActivator.java b/src/net/java/sip/communicator/plugin/advancedconfig/AdvancedConfigActivator.java
index 3423e45..8a4fd1d 100644
--- a/src/net/java/sip/communicator/plugin/advancedconfig/AdvancedConfigActivator.java
+++ b/src/net/java/sip/communicator/plugin/advancedconfig/AdvancedConfigActivator.java
@@ -47,6 +47,16 @@ public class AdvancedConfigActivator
         = "net.java.sip.communicator.plugin.advancedconfig.DISABLED";
 
     /**
+     * The advanced configuration panel registered by this bundle.
+     */
+    private static AdvancedConfigurationPanel panel;
+
+    /**
+     * The OSGi service registration of the panel.
+     */
+    private static ServiceRegistration panelRegistration;
+
+    /**
      * Starts this bundle.
      * @param bc the bundle context
      * @throws Exception if something goes wrong
@@ -63,12 +73,16 @@ public class AdvancedConfigActivator
         Dictionary<String, String> properties = new Hashtable<String, String>();
         properties.put( ConfigurationForm.FORM_TYPE,
                         ConfigurationForm.GENERAL_TYPE);
-        bundleContext
+        panel = new AdvancedConfigurationPanel();
+        panelRegistration = bundleContext
             .registerService(
                 ConfigurationForm.class.getName(),
-                new AdvancedConfigurationPanel(),
+                panel,
                 properties);
 
+
+        bundleContext.addServiceListener(panel);
+
         if (logger.isInfoEnabled())
             logger.info("ADVANCED CONFIG PLUGIN... [REGISTERED]");
     }
@@ -80,6 +94,8 @@ public class AdvancedConfigActivator
      */
     public void stop(BundleContext bc) throws Exception
     {
+        bc.removeServiceListener(panel);
+        panelRegistration.unregister();
     }
 
     /**
diff --git a/src/net/java/sip/communicator/plugin/advancedconfig/AdvancedConfigurationPanel.java b/src/net/java/sip/communicator/plugin/advancedconfig/AdvancedConfigurationPanel.java
index 9cd63d1..8f362a5 100644
--- a/src/net/java/sip/communicator/plugin/advancedconfig/AdvancedConfigurationPanel.java
+++ b/src/net/java/sip/communicator/plugin/advancedconfig/AdvancedConfigurationPanel.java
@@ -58,8 +58,6 @@ public class AdvancedConfigurationPanel
     {
         super(new BorderLayout(10, 0));
 
-        AdvancedConfigActivator.bundleContext.addServiceListener(this);
-
         initList();
 
         centerPanel.setPreferredSize(new Dimension(500, 500));
diff --git a/src/net/java/sip/communicator/plugin/keybindingchooser/keybindingChooser.manifest.mf b/src/net/java/sip/communicator/plugin/keybindingchooser/keybindingChooser.manifest.mf
index 2746eea..1bb8e90 100644
--- a/src/net/java/sip/communicator/plugin/keybindingchooser/keybindingChooser.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/keybindingchooser/keybindingChooser.manifest.mf
@@ -14,4 +14,4 @@ Import-Package: org.osgi.framework,
  net.java.sip.communicator.util.swing,
  javax.swing,
  javax.swing.event,
- javax.swing.table,
+ javax.swing.table
diff --git a/src/net/java/sip/communicator/plugin/notificationconfiguration/notificationconfiguration.manifest.mf b/src/net/java/sip/communicator/plugin/notificationconfiguration/notificationconfiguration.manifest.mf
index 6c766c6..7d2106e 100644
--- a/src/net/java/sip/communicator/plugin/notificationconfiguration/notificationconfiguration.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/notificationconfiguration/notificationconfiguration.manifest.mf
@@ -27,4 +27,4 @@ Import-Package: org.osgi.framework,
  javax.swing.filechooser,
  javax.swing.tree,
  javax.swing.undo,
- javax.swing.border,
+ javax.swing.border