[SCM] kdeconnect packaging branch, master, updated. upstream/1.0.1-206-gf661872

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit d89bf512cfa41fcc2dd6a57fdbff5cdbb40f53fc
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Mon Aug 29 20:31:52 2016 +0200

    We should always emit an entry for "."
    
    Note this doesn't fix the bug yet, as the KIO just redirects to the SSHFS,
    which happens to have the same problem.
    
    BUG: 367878
---
 kio/kiokdeconnect.cpp | 31 ++++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/kio/kiokdeconnect.cpp b/kio/kiokdeconnect.cpp
index 107609c..50bc597 100644
--- a/kio/kiokdeconnect.cpp
+++ b/kio/kiokdeconnect.cpp
@@ -93,7 +93,7 @@ void KioKdeconnect::listAllDevices()
 
         if (!interface.hasPlugin("kdeconnect_sftp")) continue;
 
-        const QString target = QString("kdeconnect://").append(deviceId).append("/");
+        const QString path = QString("kdeconnect://").append(deviceId).append("/");
         const QString name = interface.name();
         const QString icon = "kdeconnect";
 
@@ -101,12 +101,20 @@ void KioKdeconnect::listAllDevices()
         entry.insert(KIO::UDSEntry::UDS_NAME, name);
         entry.insert(KIO::UDSEntry::UDS_ICON_NAME, icon);
         entry.insert(KIO::UDSEntry::UDS_FILE_TYPE, S_IFDIR);
-        entry.insert(KIO::UDSEntry::UDS_ACCESS, S_IRUSR | S_IRGRP | S_IROTH);
+        entry.insert(KIO::UDSEntry::UDS_ACCESS, S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH);
         entry.insert(KIO::UDSEntry::UDS_MIME_TYPE, "");
-        entry.insert(KIO::UDSEntry::UDS_URL, target);
+        entry.insert(KIO::UDSEntry::UDS_URL, path);
         listEntry(entry);
     }
 
+    // We also need a non-null and writable UDSentry for "."
+    KIO::UDSEntry entry;
+    entry.insert(KIO::UDSEntry::UDS_NAME, QStringLiteral("."));
+    entry.insert(KIO::UDSEntry::UDS_FILE_TYPE, S_IFDIR);
+    entry.insert(KIO::UDSEntry::UDS_SIZE, 0);
+    entry.insert(KIO::UDSEntry::UDS_ACCESS, S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IWGRP | S_IXGRP | S_IROTH | S_IXOTH);
+    listEntry(entry);
+
     infoMessage("");
     finished();
 }
@@ -140,20 +148,29 @@ void KioKdeconnect::listDevice()
 
     for (QVariantMap::iterator it = urls.begin(); it != urls.end(); ++it) {
 
-        QString path = it.key();
-        QString name = it.value().toString();
+        const QString path = it.key();
+        const QString name = it.value().toString();
+        const QString icon = QLatin1Literal("folder");
 
         KIO::UDSEntry entry;
         entry.insert(KIO::UDSEntry::UDS_NAME, "files");
         entry.insert(KIO::UDSEntry::UDS_DISPLAY_NAME, name);
-        entry.insert(KIO::UDSEntry::UDS_ICON_NAME, "folder");
+        entry.insert(KIO::UDSEntry::UDS_ICON_NAME, icon);
         entry.insert(KIO::UDSEntry::UDS_FILE_TYPE, S_IFDIR);
-        entry.insert(KIO::UDSEntry::UDS_ACCESS, S_IRUSR | S_IRGRP | S_IROTH);
+        entry.insert(KIO::UDSEntry::UDS_ACCESS, S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH);
         entry.insert(KIO::UDSEntry::UDS_MIME_TYPE, "");
         entry.insert(KIO::UDSEntry::UDS_URL, QUrl::fromLocalFile(path).toString());
         listEntry(entry);
     }
 
+    // We also need a non-null and writable UDSentry for "."
+    KIO::UDSEntry entry;
+    entry.insert(KIO::UDSEntry::UDS_NAME, QStringLiteral("."));
+    entry.insert(KIO::UDSEntry::UDS_FILE_TYPE, S_IFDIR);
+    entry.insert(KIO::UDSEntry::UDS_SIZE, 0);
+    entry.insert(KIO::UDSEntry::UDS_ACCESS, S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IWGRP | S_IXGRP | S_IROTH | S_IXOTH);
+    listEntry(entry);
+
     infoMessage("");
     finished();
 

-- 
kdeconnect packaging