Adds UI for cross protocol conference calls. Adds also the possibility to add an incoming call into an existing call/conference. Fixes also the drag'n'drop for cross-protocol accounts.

1 files changed, 2 insertions, 0 deletions

diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetBasicTelephonyJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetBasicTelephonyJabberImpl.java
index 3614908..f57abfc 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetBasicTelephonyJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetBasicTelephonyJabberImpl.java
@@ -152,6 +152,7 @@ public class OperationSetBasicTelephonyJabberImpl
         if(callPeer.getCall() != call)
         {
             // We may have a Google Talk call here
+            callPeer.getCall().setCallGroup(group);
             return callPeer.getCall();
         }
 
@@ -454,6 +455,7 @@ public class OperationSetBasicTelephonyJabberImpl
                 CallGTalkImpl callGTalk = new CallGTalkImpl(this);
                 MediaUseCase useCase = call.getMediaUseCase();
                 boolean isVideo = call.isLocalVideoAllowed(useCase);
+                callGTalk.setCallGroup(call.getCallGroup());
 
                 callGTalk.setLocalVideoAllowed(isVideo, useCase);
                 peer = callGTalk.initiateGTalkSession(fullCalleeURI,