[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=1b55901

The following commit has been merged in the master branch:
commit 1b559019cab6086049b8272a3b4cb399a1764c11
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Mon Apr 14 21:08:41 2014 +0200

    Implemented migration from older versions of KDE Connect
    
    That stored private keys in KConf instead of PEM files.
---
 kded/daemon.cpp | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/kded/daemon.cpp b/kded/daemon.cpp
index c4ee427..152129e 100644
--- a/kded/daemon.cpp
+++ b/kded/daemon.cpp
@@ -45,6 +45,7 @@ Daemon::Daemon(QObject *parent) : QObject(parent)
         //uuids contain charcaters that are not exportable in dbus paths
         uuid = uuid.mid(1, uuid.length() - 2).replace("-", "_");
         config->group("myself").writeEntry("id", uuid);
+        config->sync();
         kDebug(kdeconnect_kded()) << "My id:" << uuid;
     }
 
@@ -75,11 +76,17 @@ Daemon::Daemon(QObject *parent) : QObject(parent)
             //return;
         }
 
-        //http://delta.affinix.com/docs/qca/rsatest_8cpp-example.html        
-        privKey.write(QCA::KeyGenerator().createRSA(2048).toPEM().toAscii());
+        //http://delta.affinix.com/docs/qca/rsatest_8cpp-example.html
+        if (config->group("myself").hasKey("privateKey")) {
+            //Migration from older versions of KDE Connect
+            privKey.write(config->group("myself").readEntry<QString>("privateKey",QCA::KeyGenerator().createRSA(2048).toPEM()).toAscii());
+        } else {
+            privKey.write(QCA::KeyGenerator().createRSA(2048).toPEM().toAscii());
+        }
         privKey.close();
-        
+
         config->group("myself").writeEntry("privateKeyPath", privateKeyPath);
+        config->sync();
     }
     
     if (QFile::permissions(config->group("myself").readEntry("privateKeyPath")) != strict)

-- 
kdeconnect packaging