[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=6d6d00e

The following commit has been merged in the master branch:
commit 6d6d00eb2721949820a3ff560671f90fb0a99563
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Wed May 30 23:00:50 2012 +0100

    Use GroupNameRole and DisplayRole for groups model correctly. Do not try and add someone to "ungrouped" group
    
    BUG: 299092
    Reviewed-by: Martin Klapetek
---
 abstract-contact-delegate.cpp | 2 +-
 contact-list-widget.cpp       | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/abstract-contact-delegate.cpp b/abstract-contact-delegate.cpp
index 688dd95..852d2f6 100644
--- a/abstract-contact-delegate.cpp
+++ b/abstract-contact-delegate.cpp
@@ -117,7 +117,7 @@ void AbstractContactDelegate::paintHeader(QPainter *painter, const QStyleOptionV
 
     //create an area for text which does not overlap with the icons.
     QRect textRect = groupLabelRect.adjusted(ACCOUNT_ICON_SIZE + (SPACING*4),0,0,0);
-    QString groupHeaderString =  index.data(GroupsModel::GroupNameRole).toString().append(counts);
+    QString groupHeaderString =  index.data(Qt::DisplayRole).toString().append(counts);
 
     if (option.state & QStyle::State_HasFocus) {
         painter->setPen(m_palette->color(QPalette::Active, QPalette::HighlightedText));
diff --git a/contact-list-widget.cpp b/contact-list-widget.cpp
index 57fd3d9..2fc02de 100644
--- a/contact-list-widget.cpp
+++ b/contact-list-widget.cpp
@@ -708,10 +708,12 @@ void ContactListWidget::dropEvent(QDropEvent *event)
 
             kDebug() << contact->contact().data()->alias() << "added to group" << group;
 
-            Tp::PendingOperation *op = contact->contact().data()->addToGroup(group);
+            if (!group.isEmpty()) {
+                Tp::PendingOperation *op = contact->contact().data()->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 {

-- 
ktp-contact-list packaging