- In the Conference Invite Dialog clear the list of selected contacts when the account changes.

- Fix the error message when a MetaContact is dragged to a conference call.

resources/languages/resources.properties

@@ -75,6 +75,7 @@ service.gui.BUSY_MESSAGE=Sorry, I'm busy right now.
 service.gui.CALL=Call
 service.gui.CALL_CONTACT=Call contact
 service.gui.CALL_VIA=Call via:
+service.gui.CALL_NOT_SUPPORTING_PARTICIPANT=This call only supports participants from the {0} network and your {1} account. {2} does not support this network or account.
 service.gui.CANCEL=&Cancel
 service.gui.CHANGE_ROOM_SUBJECT=Change room's subject...
 service.gui.CHANGE_ROOM_SUBJECT_LABEL=In the field below, you can enter the new subject for this room.

src/net/java/sip/communicator/impl/gui/main/call/CallTransferHandler.java

@@ -16,6 +16,7 @@
 import net.java.sip.communicator.impl.gui.*;
 import net.java.sip.communicator.impl.gui.customcontrols.*;
 import net.java.sip.communicator.impl.gui.main.contactlist.*;
+import net.java.sip.communicator.service.contactlist.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.*;
 import net.java.sip.communicator.util.swing.*;
@@ -109,9 +110,12 @@ public boolean importData(JComponent comp, Transferable t)
 
             if (o instanceof ContactNode)
             {
+                MetaContact metaContact = ((ContactNode) o).getMetaContact();
+                ProtocolProviderService callProvider
+                    = call.getProtocolProvider();
+
                 Iterator<Contact> contacts
-                    = ((ContactNode) o).getMetaContact().getContactsForProvider(
-                        call.getProtocolProvider());
+                    = metaContact.getContactsForProvider(callProvider);
 
                 String callee = null;
                 if (contacts.hasNext())
@@ -129,8 +133,11 @@ public boolean importData(JComponent comp, Transferable t)
                         GuiActivator.getResources().getI18NString(
                             "service.gui.ERROR"),
                         GuiActivator.getResources().getI18NString(
-                            "service.gui.CONTACT_NOT_SUPPORTING_TELEPHONY",
-                            new String[]{callee}))
+                            "service.gui.CALL_NOT_SUPPORTING_PARTICIPANT",
+                            new String[]{
+                                callProvider.getAccountID().getService(),
+                                callProvider.getAccountID().getUserID(),
+                                metaContact.getDisplayName()}))
                     .showDialog();
             }
         }

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

@@ -102,6 +102,8 @@ public void actionPerformed(ActionEvent e)
                 {
                     lastSelectedAccount = accountSelectorBoxSelectedItem;
 
+                    removeAllSelectedContacts();
+
                     initContactListData(
                         (ProtocolProviderService) accountSelectorBox
                             .getSelectedItem());

src/net/java/sip/communicator/impl/gui/utils/InviteDialog.java

@@ -282,6 +282,15 @@ public void removeAllMetaContacts()
         contactListModel.removeAllElements();
     }
 
+    /**
+     * Removes all <tt>MetaContact</tt>-s from the right list of selected
+     * contacts for invite.
+     */
+    public void removeAllSelectedContacts()
+    {
+        selectedContactListModel.removeAllElements();
+    }
+
     /**
      * Returns an enumeration of the list of selected <tt>MetaContact</tt>s.
      * @return an enumeration of the list of selected <tt>MetaContact</tt>s