[SCM] ktp-contact-runner packaging branch, master, updated. debian/15.12.1-2-244-g38a1f58

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-runner.git;a=commitdiff;h=724adfb

The following commit has been merged in the master branch:
commit 724adfbb7e8ce9b946e185b193f8060bec230f52
Author: Dan Vrátil <dan at progdan.cz>
Date:   Sun Mar 11 21:21:17 2012 +0100

    Fix result icons
---
 contactrunner.cpp | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/contactrunner.cpp b/contactrunner.cpp
index 77bb920..c9dc3fd 100644
--- a/contactrunner.cpp
+++ b/contactrunner.cpp
@@ -173,7 +173,7 @@ void ContactRunner::match(Plasma::RunnerContext& context)
             match.setType(Plasma::QueryMatch::ExactMatch);
 
             QString iconFile = contactIndex.data(AccountsModel::AvatarRole).toString();
-            if (QFile::exists(iconFile)) {
+            if (!iconFile.isEmpty() && QFile::exists(iconFile)) {
                 match.setIcon(QIcon(iconFile));
             } else {
                 QString iconName;
@@ -183,20 +183,24 @@ void ContactRunner::match(Plasma::RunnerContext& context)
                         iconName = "im-user";
                         break;
                     case Tp::ConnectionPresenceTypeBusy:
-                        iconName = "im-busy";
+                        iconName = "im-user-busy";
                         break;
                     case Tp::ConnectionPresenceTypeAway:
                     case Tp::ConnectionPresenceTypeExtendedAway:
-                        iconName = "im-away";
+                        iconName = "im-user-away";
                         break;
                     case Tp::ConnectionPresenceTypeHidden:
+                        iconName = "im-invisible-user";
+                        break;
                     case Tp::ConnectionPresenceTypeOffline:
-                        iconName = "im-offline";
+                        iconName = "im-user-offline";
                         break;
                     default:
-                        iconName = "im-offline";
+                        iconName = "im-user-offline";
+                        break;
                 }
-                match.setIcon(QIcon::fromTheme("im-user"));
+
+                match.setIcon(QIcon::fromTheme(iconName));
             }
 
             QString status = contactIndex.data(AccountsModel::PresenceStatusRole).toString();
@@ -209,7 +213,7 @@ void ContactRunner::match(Plasma::RunnerContext& context)
             else if (!status.isEmpty() && statusMessage.isEmpty())
                 match.setSubtext(status.replace(0, 1, status.left(1).toUpper()));
 
-            match.setSelectedAction(action("start-text-chat"));
+            match.setSelectedAction(defaultAction);
 
             match.setData(qVariantFromValue(contactIndex));
 

-- 
ktp-contact-runner packaging