[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=9459001

The following commit has been merged in the master branch:
commit 9459001fbe70924ea1ee78dd8b718acff7bcb234
Author: Aleix Pol <aleixpol at kde.org>
Date:   Sat Jun 14 19:10:20 2014 +0200

    Use the icon for the device, in the file item actions
    
    This way, we have visual information of what type of file we're sending it
    to.
---
 fileitemactionplugin/sendfileitemaction.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fileitemactionplugin/sendfileitemaction.cpp b/fileitemactionplugin/sendfileitemaction.cpp
index 508f182..9d04dfd 100644
--- a/fileitemactionplugin/sendfileitemaction.cpp
+++ b/fileitemactionplugin/sendfileitemaction.cpp
@@ -54,7 +54,7 @@ QList<QAction*> SendFileItemAction::actions(const KFileItemListProperties& fileI
         QModelIndex idx = m.index(i);
         DeviceDbusInterface* dev = m.getDevice(idx);
         if(dev->isReachable() && dev->isPaired()) {
-            QAction* action = new QAction(dev->name(), parentWidget);
+            QAction* action = new QAction(QIcon::fromTheme(dev->iconName()), dev->name(), parentWidget);
             action->setProperty("id", idx.data(DevicesModel::IdModelRole));
             action->setProperty("urls", QVariant::fromValue(fileItemInfos.urlList()));
             action->setProperty("parentWidget", QVariant::fromValue(parentWidget));
@@ -71,7 +71,6 @@ QList<QAction*> SendFileItemAction::actions(const KFileItemListProperties& fileI
     } else {
         if(actions.count() == 1) {
             actions.first()->setText(i18n("Send to '%1' via KDE Connect", actions.first()->text()));
-            actions.first()->setIcon(QIcon::fromTheme("preferences-system-network"));
         }
         return actions;
     }

-- 
kdeconnect packaging