4 files changed, 61 insertions, 9 deletions
diff --git a/Swift/Controllers/Roster/Roster.cpp b/Swift/Controllers/Roster/Roster.cpp
index 84561e5..77d6b78 100644
--- a/Swift/Controllers/Roster/Roster.cpp
+++ b/Swift/Controllers/Roster/Roster.cpp
@@ -49,10 +49,32 @@ Roster::~Roster() {
 GroupRosterItem* Roster::getRoot() const {
        return root_;
 }
+std::set<JID> Roster::getJIDs() const {
+        std::set<JID> jids;
+        std::deque<RosterItem*> queue;
+        queue.push_back(root_);
+        while (!queue.empty()) {
+                RosterItem* item = *queue.begin();
+                queue.pop_front();
+                GroupRosterItem* group = dynamic_cast<GroupRosterItem*>(item);
+                ContactRosterItem *contact = dynamic_cast<ContactRosterItem*>(item);
+                if (contact) {
+                        jids.insert(contact->getJID());
+                        jids.insert(contact->getDisplayJID());
+                }
+                else if (group) {
+                        queue.insert(queue.begin(), group->getChildren().begin(), group->getChildren().end());
+                }
+        }
+        return jids;
+}
 GroupRosterItem* Roster::getGroup(const std::string& groupName) {
        foreach (RosterItem *item, root_->getChildren()) {
                GroupRosterItem *group = dynamic_cast<GroupRosterItem*>(item);
                if (group && group->getDisplayName() == groupName) {
                        return group;
diff --git a/Swift/Controllers/Roster/Roster.h b/Swift/Controllers/Roster/Roster.h
index c25feaa..269ec4d 100644
--- a/Swift/Controllers/Roster/Roster.h
+++ b/Swift/Controllers/Roster/Roster.h
@@ -40,10 +40,12 @@ class Roster {
                void applyOnAllItems(const RosterItemOperation& operation);
                void applyOnItem(const RosterItemOperation& operation, const JID& jid);
                void addFilter(RosterFilter* filter);
                void removeFilter(RosterFilter* filter);
                GroupRosterItem* getRoot() const;
+                std::set<JID> getJIDs() const;
                std::vector<RosterFilter*> getFilters() {return filters_;}
                boost::signal<void (GroupRosterItem*)> onChildrenChanged;
                boost::signal<void (GroupRosterItem*)> onGroupAdded;
                boost::signal<void (RosterItem*)> onDataChanged;
                boost::signal<void (JID&)> onVCardUpdateRequested;
diff --git a/Swift/QtUI/QtChatWindow.cpp b/Swift/QtUI/QtChatWindow.cpp
index d58393b..abbfae5 100644
--- a/Swift/QtUI/QtChatWindow.cpp
+++ b/Swift/QtUI/QtChatWindow.cpp
@@ -595,11 +595,33 @@ void QtChatWindow::dragEnterEvent(QDragEnterEvent *event) {
                                event->acceptProposedAction();
                        }
                }
                else if (event->mimeData()->hasFormat("application/vnd.swift.contact-jid-list")) {
                        if (isMUC_ || supportsImpromptuChat_) {
-                                event->acceptProposedAction();
+                                // Prevent invitations or impromptu initializations for contacts that you are already chatting to.
+                                std::vector<JID> droppedJIDs =jidListFromQByteArray(event->mimeData()->data("application/vnd.swift.contact-jid-list"));
+                                std::set<JID> conversationJIDs;
+                                if (isMUC_) {
+                                        conversationJIDs = treeWidget_->getRoster()->getJIDs();
+                                }
+                                for (std::vector<JID>::iterator i = droppedJIDs.begin(); i != droppedJIDs.end(); ) {
+                                        const JID& droppedJID = *i;
+                                        if (conversationJIDs.find(droppedJID) != conversationJIDs.end()) {
+                                                i = droppedJIDs.erase(i);
+                                        }
+                                        else {
+                                                ++i;
+                                        }
+                                }
+                                if (droppedJIDs.empty()) {
+                                        event->ignore();
+                                }
+                                else {
+                                        event->acceptProposedAction();
+                                }
                        }
                }
        }
 }
@@ -614,22 +636,26 @@ void QtChatWindow::dropEvent(QDropEvent *event) {
                        message.append(boost::make_shared<ChatTextMessagePart>(messageText));
                        addSystemMessage(message, DefaultDirection);
                }
        }
        else if (event->mimeData()->hasFormat("application/vnd.swift.contact-jid-list")) {
-                QByteArray dataBytes = event->mimeData()->data("application/vnd.swift.contact-jid-list");
+                std::vector<JID> invites = jidListFromQByteArray(event->mimeData()->data("application/vnd.swift.contact-jid-list"));
-                QDataStream dataStream(&dataBytes, QIODevice::ReadOnly);
-                std::vector<JID> invites;
-                while (!dataStream.atEnd()) {
-                        QString jidString;
-                        dataStream >> jidString;
-                        invites.push_back(Q2PSTRING(jidString));
-                }
                onInviteToChat(invites);
        }
 }
+std::vector<JID> QtChatWindow::jidListFromQByteArray(const QByteArray& dataBytes) {
+        QDataStream dataStream(dataBytes);
+        std::vector<JID> invites;
+        while (!dataStream.atEnd()) {
+                QString jidString;
+                dataStream >> jidString;
+                invites.push_back(Q2PSTRING(jidString));
+        }
+        return invites;
+}
 void QtChatWindow::setAvailableOccupantActions(const std::vector<OccupantAction>& actions) {
        treeWidget_->setAvailableOccupantActions(actions);
 }
 void QtChatWindow::setSubject(const std::string& subject) {
diff --git a/Swift/QtUI/QtChatWindow.h b/Swift/QtUI/QtChatWindow.h
index 8d7db59..bbcdee7 100644
--- a/Swift/QtUI/QtChatWindow.h
+++ b/Swift/QtUI/QtChatWindow.h
@@ -183,10 +183,12 @@ namespace Swift {
                        void handleSettingChanged(const std::string& setting);
                        void handleOccupantSelectionChanged(RosterItem* item);
                        void handleAppendedToLog();
+                        static std::vector<JID> jidListFromQByteArray(const QByteArray& dataBytes);
                private:
                        int unreadCount_;
                        bool contactIsTyping_;
                        LastLineTracker lastLineTracker_;
                        std::string id_;