Fixes duplicating otr menu entries per contact in merged metacontact.

src/net/java/sip/communicator/plugin/otr/OtrActivator.java

@@ -222,14 +222,6 @@ public void setBundleContext(BundleContext context)
         bundleContext = context;
     }
 
-    private ServiceRegistration regRightClickMenu;
-
-    private ServiceRegistration regMenuBarMenu;
-
-    private ServiceRegistration regButtonBarButton;
-
-    private ServiceRegistration regConfigurationForm;
-
     private void handleProviderAdded(ProtocolProviderService provider)
     {
         OperationSetInstantMessageTransform opSetMessageTransform
@@ -283,19 +275,6 @@ public void stop(BundleContext bc) throws Exception
                 this.handleProviderRemoved(provider);
             }
         }
-
-        // Unregister UI
-        if (this.regButtonBarButton != null)
-            this.regButtonBarButton.unregister();
-
-        if (this.regConfigurationForm != null)
-            this.regConfigurationForm.unregister();
-
-        if (this.regMenuBarMenu != null)
-            this.regMenuBarMenu.unregister();
-
-        if (this.regRightClickMenu != null)
-            this.regRightClickMenu.unregister();
     }
 
     private void handleProviderRemoved(ProtocolProviderService provider)

src/net/java/sip/communicator/plugin/otr/OtrContactMenu.java

@@ -217,6 +217,8 @@ public void globalPolicyChanged()
      */
     private void buildMenu()
     {
+        separateMenu.removeAll();
+
         OtrPolicy policy = OtrActivator.scOtrEngine.getContactPolicy(contact);
 
         JMenuItem endOtr = new JMenuItem();