[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=6549da8

The following commit has been merged in the master branch:
commit 6549da84be5558d80f78b208b624e08024a62c08
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Fri Jun 6 00:02:27 2014 +0200

    Incoming shared files can now be placed in device-dependent dirs.
---
 kded/plugins/share/share_config.cpp |  2 +-
 kded/plugins/share/share_config.ui  | 11 +++++++++--
 kded/plugins/share/shareplugin.cpp  |  8 +++++---
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/kded/plugins/share/share_config.cpp b/kded/plugins/share/share_config.cpp
index 55d2f51..d04bf07 100644
--- a/kded/plugins/share/share_config.cpp
+++ b/kded/plugins/share/share_config.cpp
@@ -70,7 +70,7 @@ void ShareConfig::load()
 
 void ShareConfig::save()
 {
-    m_cfg->group("receive").writeEntry("path", m_ui->kurlrequester->url());
+    m_cfg->group("receive").writeEntry("path", m_ui->kurlrequester->text());
 
     KCModule::save();
 
diff --git a/kded/plugins/share/share_config.ui b/kded/plugins/share/share_config.ui
index 5f355e4..d6f618f 100644
--- a/kded/plugins/share/share_config.ui
+++ b/kded/plugins/share/share_config.ui
@@ -9,8 +9,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>411</width>
-    <height>165</height>
+    <width>569</width>
+    <height>140</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -47,6 +47,13 @@
         </item>
        </layout>
       </item>
+      <item>
+       <widget class="QLabel" name="label_2">
+        <property name="text">
+         <string>%1  in the path will be replaced with the specific device name.</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
diff --git a/kded/plugins/share/shareplugin.cpp b/kded/plugins/share/shareplugin.cpp
index 00ccac9..5520a39 100644
--- a/kded/plugins/share/shareplugin.cpp
+++ b/kded/plugins/share/shareplugin.cpp
@@ -52,11 +52,13 @@ KUrl SharePlugin::destinationDir() const
     KUrl dir = config->group("receive").readEntry("path", KGlobalSettings::downloadPath());
     dir.adjustPath(KUrl::AddTrailingSlash);
 
-    QDir().mkpath(dir.toLocalFile());
+    QString url = dir.toLocalFile();
+    if (url.contains("%1")) url = url.arg(device()->name());
 
-    kDebug(kdeconnect_kded()) << dir;
+    kDebug(kdeconnect_kded()) << url;
+    QDir().mkpath(url);
 
-    return dir;
+    return url;
 }
 
 bool SharePlugin::receivePackage(const NetworkPackage& np)

-- 
kdeconnect packaging