Checks for contact capabilities when adding video and desktop streaming buttons in the call.

1 files changed, 33 insertions, 4 deletions

diff --git a/src/net/java/sip/communicator/impl/gui/main/call/CallPanel.java b/src/net/java/sip/communicator/impl/gui/main/call/CallPanel.java
index 20eb34b..c7cbd96 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/CallPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/CallPanel.java
@@ -1174,10 +1174,6 @@ public class CallPanel
      */
     private void addOneToOneSpecificComponents()
     {
-        settingsPanel.add(transferCallButton);
-        settingsPanel.add(desktopSharingButton);
-        settingsPanel.add(videoButton);
-
         Iterator<? extends CallPeer> callPeers = call.getCallPeers();
 
         while (callPeers.hasNext())
@@ -1189,6 +1185,39 @@ public class CallPanel
                 enableButtons(true);
                 return;
             }
+
+            settingsPanel.add(transferCallButton);
+
+            Contact peerContact = callPeer.getContact();
+
+            ProtocolProviderService callProvider
+                = call.getProtocolProvider();
+
+            OperationSetContactCapabilities capOpSet
+                = callProvider.getOperationSet(
+                    OperationSetContactCapabilities.class);
+
+            if (peerContact != null
+                && capOpSet != null)
+            {
+                if (capOpSet.getOperationSet(peerContact,
+                    OperationSetDesktopSharingServer.class) != null)
+                    settingsPanel.add(desktopSharingButton);
+
+                if (capOpSet.getOperationSet(peerContact,
+                    OperationSetVideoTelephony.class) != null)
+                    settingsPanel.add(videoButton);
+            }
+            else
+            {
+                if (callProvider.getOperationSet(
+                    OperationSetDesktopSharingServer.class) != null)
+                    settingsPanel.add(desktopSharingButton);
+
+                if (callProvider.getOperationSet(
+                    OperationSetVideoTelephony.class) != null)
+                    settingsPanel.add(videoButton);
+            }
         }
         enableButtons(false);
     }