[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=879580f

The following commit has been merged in the master branch:
commit 879580f0a5885a096d0b8c7cd0c82c6037a65a12
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Tue Jan 15 15:10:06 2013 +0100

    Don't allow dropping contacts to Unsorted group
    
    ...or a group the contact is already in.
---
 contact-list-widget.cpp | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/contact-list-widget.cpp b/contact-list-widget.cpp
index 1b7f401..c7df363 100644
--- a/contact-list-widget.cpp
+++ b/contact-list-widget.cpp
@@ -635,21 +635,25 @@ void ContactListWidget::dropEvent(QDropEvent *event)
             if (index.data(ContactsModel::TypeRole).toInt() == ContactsModel::GroupRowType) {
                 // contact is dropped on a group, so take it's name
                 group = index.data(GroupsModel::GroupNameRole).toString();
-            } else {
+            } else if (index.data(ContactsModel::TypeRole).toInt() == ContactsModel::ContactRowType) {
                 // contact is dropped on another contact, so take it's parents (group) name
                 group = index.parent().data(GroupsModel::GroupNameRole).toString();
             }
 
+            if (group.isEmpty() || (group == QLatin1String("_unsorted")) ||
+                contact->groups().contains(group)) {
+                continue;
+            }
+
             kDebug() << contact->alias() << "added to group" << group;
 
-            if (!group.isEmpty()) {
-                Tp::PendingOperation *op = contact->addToGroup(group);
+            Tp::PendingOperation *op = contact->addToGroup(group);
 
-                connect(op, SIGNAL(finished(Tp::PendingOperation*)),
-                        this, SIGNAL(genericOperationFinished(Tp::PendingOperation*)));
-            }
+            connect(op, SIGNAL(finished(Tp::PendingOperation*)),
+                    this, SIGNAL(genericOperationFinished(Tp::PendingOperation*)));
         }
         event->acceptProposedAction();
+
     } else {
         event->ignore();
     }

-- 
ktp-contact-list packaging