Merge lp:~michihenning/storage-framework/add-nextcloud-provider into lp:storage-framework/devel

[Michi Henning]

Added changes needed by
https://code.launchpad.net/~jamesh/storage-provider-webdav/nextcloud-provider/+merge/321948
for Nextcloud provider.

Added changes needed by
https://code.launchpad.net/~jamesh/storage-provider-webdav/nextcloud-provider/+merge/321948
for Nextcloud provider.

[unity-api-1-bot (unity-api-1-bot)]

PASSED: Continuous integration, rev:124
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/280/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1920
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1927
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1709
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1709/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1709
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1709/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1709
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1709/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1709
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1709/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1709
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1709/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1709
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1709/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/280/rebuild

review: Approve (continuous-integration)

[James Henstridge (jamesh)]

Looks good.

review: Approve

=== modified file 'src/qt/client/internal/remote_client/RuntimeImpl.cpp'
--- src/qt/client/internal/remote_client/RuntimeImpl.cpp	2017-01-13 04:03:12 +0000
+++ src/qt/client/internal/remote_client/RuntimeImpl.cpp	2017-04-06 02:24:50 +0000
@@ -52,6 +52,7 @@
     { "storage-provider-owncloud", "com.canonical.StorageFramework.Provider.OwnCloud" },
     { "storage-provider-onedrive", "com.canonical.StorageFramework.Provider.OnedriveProvider" },
     { "storage-provider-gdrive", "com.canonical.StorageFramework.Provider.GdriveProvider" },
+    { "storage-provider-nextloud", "com.canonical.StorageFramework.Provider.Nextcloud" },
 };
 
 }  // namespace
 
=== modified file 'src/registry/internal/ListAccountsHandler.cpp'
--- src/registry/internal/ListAccountsHandler.cpp	2017-03-17 09:43:46 +0000
+++ src/registry/internal/ListAccountsHandler.cpp	2017-04-06 02:24:50 +0000
@@ -71,9 +71,10 @@
 {
     { "storage-provider-test", { "com.canonical.StorageFramework.Provider.ProviderTest", "Test Provider" } },
     { "storage-provider-mcloud", { "com.canonical.StorageFramework.Provider.McloudProvider", "mcloud" } },
-    { "storage-provider-owncloud", { "com.canonical.StorageFramework.Provider.OwnCloud", "ownCloud" } },
+    { "storage-provider-owncloud", { "com.canonical.StorageFramework.Provider.OwnCloud", "OwnCloud" } },
     { "storage-provider-onedrive", { "com.canonical.StorageFramework.Provider.OnedriveProvider", "OneDrive" } },
     { "storage-provider-gdrive", { "com.canonical.StorageFramework.Provider.GdriveProvider", "GDrive" } },
+    { "storage-provider-nextcloud", { "com.canonical.StorageFramework.Provider.Nextcloud", "Nextcloud" } },
 };
 
 }  // namespace