Merge lp:~mardy/ubuntu-system-settings-online-accounts/show-u1-1559506 into lp:ubuntu-system-settings-online-accounts

[Alberto Mardegan]

Always show the UbuntuOne provider in the providers list

Always show the UbuntuOne provider in the providers list

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:345
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-ci/289/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/1000/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-wily-amd64-ci/77/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-wily-i386-ci/77/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/1000/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-online-accounts-ci/289/rebuild

review: Needs Fixing (continuous-integration)

[dobey (dobey)]

review: Approve

=== modified file 'plugins/OnlineAccountsPlugin/application-manager.cpp'
--- plugins/OnlineAccountsPlugin/application-manager.cpp	2016-03-08 08:48:40 +0000
+++ plugins/OnlineAccountsPlugin/application-manager.cpp	2016-03-31 10:06:15 +0000
@@ -227,7 +227,8 @@
     Q_FOREACH(const Accounts::Service &service, allServices) {
         if (providers.contains(service.provider())) continue;
 
-        if (!manager->applicationList(service).isEmpty()) {
+        if (!manager->applicationList(service).isEmpty() ||
+            service.provider() == "ubuntuone") {
             providers.append(service.provider());
         }
     }