Merge branch 'master' of github.com:owncloud/mirall

src/mirall/owncloudfolder.cpp

@@ -100,6 +100,15 @@ QString ownCloudFolder::secondPath() const
     return re;
 }
 
+QString ownCloudFolder::nativeSecondPath() const
+{
+    // TODO: fold into secondPath() after 1.1.0 release
+    QString path = secondPath();
+    if (!path.startsWith(QLatin1Char('/')) || path.isEmpty())
+        path.prepend(QLatin1Char('/'));
+    return path;
+}
+
 void ownCloudFolder::startSync()
 {
     startSync( QStringList() );

src/mirall/owncloudfolder.h

@@ -35,6 +35,7 @@ public:
                    const QString &secondPath, QObject *parent = 0L);
     virtual ~ownCloudFolder();
     QString secondPath() const;
+    QString nativeSecondPath() const;
     virtual bool isBusy() const;
     virtual void startSync(const QStringList &pathList);