Merge lp:~michihenning/storage-framework/add-local-to-registry into lp:storage-framework/devel

[Michi Henning]

Add entry for local provider to list of accounts returned by registry.

Add entry for local provider to list of accounts returned by registry.

[James Henstridge (jamesh)]

Looks good. Placing the local provider at the end should keep any code that was using the "pick the first account" working as before.

review: Approve

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

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

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

review: Approve (continuous-integration)

=== modified file 'src/registry/CMakeLists.txt'
--- src/registry/CMakeLists.txt	2016-11-21 04:24:13 +0000
+++ src/registry/CMakeLists.txt	2017-03-17 06:32:30 +0000
@@ -1,5 +1,6 @@
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
+    ${GLIB_DEPS_INCLUDE_DIRS}
     ${ONLINEACCOUNTS_DEPS_INCLUDE_DIRS}
 )
 
@@ -31,6 +32,7 @@
     storage-framework-common-internal
     Qt5::Core
     Qt5::DBus
+    ${GLIB_DEPS_LDFLAGS}
     ${ONLINEACCOUNTS_DEPS_LDFLAGS}
 )
 

=== modified file 'src/registry/internal/ListAccountsHandler.cpp'
--- src/registry/internal/ListAccountsHandler.cpp	2017-01-13 04:03:12 +0000
+++ src/registry/internal/ListAccountsHandler.cpp	2017-03-17 06:32:30 +0000
@@ -21,6 +21,11 @@
 #include <unity/storage/internal/AccountDetails.h>
 #include <unity/storage/registry/internal/qdbus-last-error-msg.h>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wold-style-cast"
+#include <glib.h>
+#pragma GCC diagnostic pop
+
 #include <OnlineAccounts/Account>
 #include <QDebug>
 
@@ -100,6 +105,17 @@
         accounts.append(ad);
     }
 
+    // Add an entry for the local provider, which Online Accounts doesn't know about.
+    storage::internal::AccountDetails ad;
+    ad.busName = "com.canonical.StorageFramework.Provider.Local";
+    ad.objectPath = QDBusObjectPath(QStringLiteral("/provider/0"));
+    ad.id = 0;
+    ad.serviceId = g_get_user_name();
+    ad.displayName = "Local Provider";
+    ad.providerName = "Local Provider";
+    ad.iconName = "";
+    accounts.append(ad);
+
     if (!conn_.send(msg_.createReply(QVariant::fromValue(accounts))))
     {
         auto msg = last_error_msg(conn_);