Removes the zrtp lock icons from the peer panels in the conference for the peers that are not directly connected.

src/net/java/sip/communicator/impl/gui/main/call/conference/BasicConferenceParticipantPanel.java

@@ -132,7 +132,7 @@ public abstract class BasicConferenceParticipantPanel<T>
     /**
      * The security status of the peer
      */
-    protected SecurityStatusLabel securityStatusLabel;
+    protected SecurityStatusLabel securityStatusLabel = null;
 
     /**
      * The component showing the sound level of the participant.
@@ -281,9 +281,6 @@ private void initAudioConferencePanel()
 
         soundIndicator.setPreferredSize(new Dimension(80, 30));
 
-        securityStatusLabel = new SecurityStatusLabel();
-        securityStatusLabel.setSecurityOff();
-
         this.setLayout(new GridBagLayout());
         this.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
 
@@ -338,6 +335,16 @@ private void initPeerDetailsPanel()
         peerDetailsPanel.add(rightDetailsPanel, constraints);
     }
 
+    /**
+     * Creates <tt>SecurityStatusLabel</tt> and adds it to status bar.
+     */
+    public void initSecurityStatusLabel()
+    {
+        securityStatusLabel = new SecurityStatusLabel();
+        securityStatusLabel.setSecurityOff();
+        addToStatusBar(securityStatusLabel);
+    }
+    
     /**
      * Initializes the title bar.
      */
@@ -359,9 +366,6 @@ private void initTitleBar()
         statusBarConstraints.weightx = 1f;
         statusBar.add(callStatusLabel, statusBarConstraints);
 
-        if (!(participant instanceof Call))
-            addToStatusBar(securityStatusLabel);
-
         GridBagConstraints constraints = new GridBagConstraints();
 
         constraints.gridx = 0;
@@ -382,9 +386,6 @@ private void initTitleBar()
      */
     private void initVideoConferencePanel()
     {
-        securityStatusLabel = new SecurityStatusLabel();
-        securityStatusLabel.setSecurityOff();
-
         this.setLayout(new GridBagLayout());
         this.setBorder(BorderFactory.createEmptyBorder(7, 7, 7, 7));
 
@@ -408,9 +409,12 @@ public void loadSkin()
         {
             setParticipantIcon(null, false);
         }
-
-        securityStatusLabel.setIcon(
-                new ImageIcon(ImageLoader.getImage(securityImageID)));
+        
+        if(securityStatusLabel != null)
+        {
+            securityStatusLabel.setIcon(
+                    new ImageIcon(ImageLoader.getImage(securityImageID)));
+        }
     }
 
     /**
@@ -450,6 +454,8 @@ public void paintComponent(Graphics g)
      */
     public void securityOff(CallPeerSecurityOffEvent evt)
     {
+        if(securityStatusLabel == null)
+            return;
         securityStatusLabel.setText("");
         securityStatusLabel.setSecurityOff();
         if (securityStatusLabel.getBorder() == null)
@@ -467,6 +473,8 @@ public void securityOff(CallPeerSecurityOffEvent evt)
      */
     public void securityOn(CallPeerSecurityOnEvent evt)
     {
+        if(securityStatusLabel == null)
+            return;
         // If the securityOn is called without a specific event, we'll just set
         // the security label status to on.
         if (evt == null)

src/net/java/sip/communicator/impl/gui/main/call/conference/ConferencePeerPanel.java

@@ -342,6 +342,7 @@ public void mousePressed(MouseEvent e)
      */
     private void initStatusBar(CallPeer callPeer)
     {
+        initSecurityStatusLabel();
         this.setParticipantState(callPeer.getState().getLocalizedStateString());
 
         this.addToStatusBar(holdStatusLabel);