Merge lp:~mardy/online-accounts-api/update into lp:online-accounts-api

[Alberto Mardegan]

Docs, fixes, library install

- Docs
- Couple of bugfixes
- Package the daemon as a library

Docs, fixes, library install

- Docs
- Couple of bugfixes
- Package the daemon as a library

Testing instructions
====================

When installing the silo, for some reason not all packages get installed. You'll need to manually run

  sudo apt-get install qml-module-ubuntu-onlineaccounts2

To test the new API, you can use this click package: www.mardy.it/archivos/online-accounts-tool.mardy_0.2_all.click
(the source code can be found at https://code.launchpad.net/~mardy/+git/online-accounts-tool)
This test is important because it tests the full stack: QML bindings, Qt bindings (the QML bindings are built on top of the Qt ones), and D-Bus service.

Install the package in the device, then run:

  sudo vi /var/lib/apparmor/profiles/click_online-accounts-tool.mardy_online-accounts-tool_0.2

insert these lines before the last "}":

  dbus (receive, send)
       bus=session
       interface=com.ubuntu.OnlineAccounts.Manager
       peer=(label=unconfined),

and rebuild the rules:

  sudo apparmor_parser -r /var/lib/apparmor/profiles/click_online-accounts-tool.mardy_online-accounts-tool_0.2

Once that is done, start the tool (it has a big ugly "V2" icon), click the request access button to add an account, and then once the account appears in the application you can click on the button to authenticate.

[lp:~mardy/online-accounts-api/update]

68. By Alberto Mardegan on 2015-09-03

Hide library symbols

69. By Alberto Mardegan on 2015-09-04

Install .so file

70. By Alberto Mardegan on 2015-09-23

Add get() method to model

71. By Alberto Mardegan on 2015-09-23

Also read provider settings

=== modified file '.bzrignore'
--- .bzrignore	2015-07-31 12:44:30 +0000
+++ .bzrignore	2015-09-23 12:41:07 +0000
@@ -2,10 +2,10 @@
 /debian/files
 /debian/*.debhelper*
 /debian/*.substvars
+/debian/libonline-accounts-daemon1/
 /debian/libonline-accounts-daemon-dev/
 /debian/libonline-accounts-qt-dev/
 /debian/libonline-accounts-qt1/
-/debian/online-accounts-daemon/
-/debian/online-accounts-daemon-dev/
 /debian/qml-module-ubuntu-onlineaccounts2/
+/debian/qml-module-ubuntu-onlineaccounts2-doc/
 /debian/tmp/

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-08-06 12:22:06 +0000
+++ CMakeLists.txt	2015-09-23 12:41:07 +0000
@@ -17,10 +17,13 @@
 
 set(CMAKE_AUTOMOC ON)
 
+add_subdirectory(src/lib/OnlineAccountsDaemon)
 add_subdirectory(src/daemon)
 add_subdirectory(src/lib/OnlineAccounts)
 add_subdirectory(src/lib/Ubuntu/OnlineAccounts.2)
 
+add_subdirectory(doc)
+
 if(cmake_build_type_lower MATCHES coverage)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --coverage" )
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --coverage" )

=== modified file 'debian/control'
--- debian/control	2015-08-04 13:55:17 +0000
+++ debian/control	2015-09-23 12:41:07 +0000
@@ -24,22 +24,26 @@
 # code again.
 Vcs-Bzr: https://code.launchpad.net/~online-accounts/online-accounts-api/trunk
 
-Package: online-accounts-daemon
+Package: libonline-accounts-daemon1
+Section: libs
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         signond,
+Pre-Depends: ${misc:Pre-Depends},
 Description: Online Accounts simplified API (D-Bus service)
  D-Bus service implementing the simplified Online Accounts API.
 
-Package: online-accounts-daemon-dev
+Package: libonline-accounts-daemon-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         online-accounts-daemon (= ${binary:Version}),
+         libonline-accounts-daemon1 (= ${binary:Version}),
 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends},
+Breaks: online-accounts-daemon-dev
+Provides: online-accounts-daemon-dev
+Replaces: online-accounts-daemon-dev
 Description: Online Accounts simplified API (bindings development files)
  This module contains the necessary files for developing client libraries
  interfacing with the simplified Online Accounts API.
@@ -76,3 +80,14 @@
 Description: Online Accounts API for QML applications
  This module provides access to the new Online Accounts API from QML
  applications.
+
+Package: qml-module-ubuntu-onlineaccounts2-doc
+Section: doc
+Architecture: all
+Multi-Arch: foreign
+Depends: ${misc:Depends},
+Description: Online Accounts API, HTML documentation
+ This module provides access to the new Online Accounts API from QML
+ applications.
+ .
+ This package contains the HTML documentation.

=== renamed file 'debian/online-accounts-daemon-dev.install' => 'debian/libonline-accounts-daemon-dev.install'
=== renamed file 'debian/online-accounts-daemon.install' => 'debian/libonline-accounts-daemon1.install'
--- debian/online-accounts-daemon.install	2015-07-15 14:49:26 +0000
+++ debian/libonline-accounts-daemon1.install	2015-09-23 12:41:07 +0000
@@ -1,2 +1,1 @@
-usr/bin/accountd
-usr/share/dbus-1/services/com.ubuntu.OnlineAccounts.Manager.service
+usr/lib/*/libOnlineAccountsDaemon.so

=== added file 'debian/qml-module-ubuntu-onlineaccounts2-doc.install'
--- debian/qml-module-ubuntu-onlineaccounts2-doc.install	1970-01-01 00:00:00 +0000
+++ debian/qml-module-ubuntu-onlineaccounts2-doc.install	2015-09-23 12:41:07 +0000
@@ -0,0 +1,1 @@
+usr/share/doc/ubuntu-onlineaccounts2

=== modified file 'debian/rules'
--- debian/rules	2015-07-15 14:49:26 +0000
+++ debian/rules	2015-09-23 12:41:07 +0000
@@ -5,6 +5,8 @@
 #export DH_VERBOSE=1
 
 override_dh_install:
+	rm -rf debian/*/usr/bin/accountd
+	rm -rf debian/*/usr/share/dbus-1/services/com.ubuntu.OnlineAccounts.Manager.service
 	dh_install --fail-missing
 
 %:

=== added directory 'doc'
=== added file 'doc/CMakeLists.txt'
--- doc/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ doc/CMakeLists.txt	2015-09-23 12:41:07 +0000
@@ -0,0 +1,13 @@
+project(OnlineAccountsQML-doc)
+
+find_program(QDOC_EXECUTABLE qdoc)
+if(QDOC_EXECUTABLE STREQUAL "QDOC_EXECUTABLE-NOTFOUND")
+    message(WARNING "qdoc not found, documentation cannot be built")
+else()
+    add_custom_target(doc ALL
+                      COMMAND ${QDOC_EXECUTABLE}
+                      -outputdir ${CMAKE_CURRENT_BINARY_DIR}/html
+                      ${CMAKE_CURRENT_SOURCE_DIR}/ubuntu-onlineaccounts2.qdocconf)
+    install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html
+            DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/ubuntu-onlineaccounts2)
+endif()

=== added directory 'doc/css'
=== added file 'doc/css/base.css'
--- doc/css/base.css	1970-01-01 00:00:00 +0000
+++ doc/css/base.css	2015-09-23 12:41:07 +0000
@@ -0,0 +1,638 @@
+/**
+* Ubuntu Developer base stylesheet
+*
+* A base stylesheet containing site-wide styles
+*
+* @project Ubuntu Developer
+* @version 1.0
+* @author Canonical Web Team: Steve Edwards
+* @copyright 2011 Canonical Ltd.
+*/
+
+/**
+* @section Global
+*/
+
+body {
+	font-family: 'Ubuntu', 'Ubuntu Beta', UbuntuBeta, Ubuntu, 'Bitstream Vera Sans', 'DejaVu Sans', Tahoma, sans-serif;
+	font-size: 13px;
+	line-height: 1.4;
+	color: #333;
+}
+a {
+	color: #dd4814;
+	text-decoration: none;
+	outline: 0;
+}
+p, dl {
+	margin-bottom: 10px;
+}
+strong {
+	font-weight: bold;
+}
+em {
+	font-style: italic;
+}
+code{
+	padding: 10px;
+	font-family: 'Ubuntu Mono', 'Consolas', 'Monaco', 'DejaVu Sans Mono', Courier, monospace;
+	background-color: #fdf6f2;
+	display: inline-block;
+	margin-bottom: 10px;
+		-moz-border-radius: 4px;
+		-webkit-border-radius: 4px;
+	border-radius: 4px;
+}
+h1 {
+	font-size: 36px;
+	line-height: 1.1;
+	margin-bottom: 20px;
+}
+article h1,
+h2 {
+	font-size: 24px;
+	line-height: 1.2;
+	margin-bottom: 14px;
+}
+h3 {
+	font-size: 16px;
+	line-height: 1.3;
+	margin-bottom: 8px;
+}
+h4 {
+	font-weight: bold;
+}
+
+time {
+	color:#999;
+}
+
+/**
+* @section Structure
+*/
+
+.header-login,
+.header-navigation div,
+.header-content div {
+	margin: 0 auto;
+	width: 940px;
+}
+
+.header-content h1{
+	background-color:#ffffff;
+	display:inline-block;
+}
+
+.header-content h2{
+	background-color:#ffffff;
+	display:table;
+}
+
+.header-login ul {
+	margin: 4px 0;
+	float: right;
+}
+.header-login li {
+	margin-right: 10px;
+	float: left;
+}
+.header-login a {
+	color: #333;
+}
+.header-navigation {
+	border-top: 2px solid #dd4814;
+	border-bottom: 2px solid #dd4814;
+	background-color: #fff;
+	height: 54px;
+	clear: right;
+	overflow: hidden;
+}
+.header-navigation nav ul {
+	border-right: 1px solid #dd4814;
+	float: right;
+}
+.header-navigation nav li {
+	border-left: 1px solid #dd4814;
+	float: left;
+	height: 54px;
+}
+.header-navigation nav a {
+	padding: 18px 14px 0;
+	font-size: 14px;
+	display: block;
+	height: 36px;
+}
+.header-navigation nav a:hover {
+	background-color: #fcece7;
+}
+.header-navigation nav .current_page_item a,
+.header-navigation nav .current_page_parent a,
+.header-navigation nav .current_page_ancestor a {
+	background-color: #dd4814;
+	color: #fff;
+}
+.header-navigation input {
+	margin: 12px 10px 0 10px;
+	padding: 5px;
+	border-top: 1px solid #a1a1a1;
+	border-right: 1px solid #e0e0e0;
+	border-bottom: 1px solid #fff;
+	border-left: 1px solid #e0e0e0;
+	width: 90px;
+	font-style: italic;
+	color: #ccc;
+		-moz-border-radius: 3px;
+		-webkit-border-radius: 3px;
+	border-radius: 3px;
+		-moz-box-shadow: inset 0 1px 1px #e0e0e0;
+	   -webkit-box-shadow: inset 0 1px 1px #e0e0e0;
+   box-shadow: inset 0 1px 1px #e0e0e0;
+}
+.header-navigation h2 {
+	margin: 18px 0 0 6px;
+	text-transform: lowercase;
+	font-size: 22px;
+	color: #dd4814;
+	float: left;
+}
+.header-navigation .logo-ubuntu {
+	margin-top: 12px;
+	float: left;
+}
+.header-content .header-navigation-secondary {
+	margin-bottom: 40px;
+	padding: 0;
+	position: relative;
+	z-index: 2;
+}
+.header-navigation-secondary div {
+	padding: 0;
+	border: 2px solid #dd4814;
+		-moz-border-radius: 0px 0px 4px 4px;
+		-webkit-border-radius: 0px 0px 4px 4px;
+	border-radius: 0px 0px 4px 4px;
+	background: #fff;
+	border-top: 0px;
+	width: 936px;
+}
+.header-navigation-secondary nav li {
+	float: left;
+}
+.header-navigation-secondary nav li a {
+	color: #333;
+	display: block;
+	height: 25px;
+	padding: 8px 8px 0;
+}
+.header-navigation-secondary nav li:hover,
+.header-navigation-secondary nav .current_page_item a {
+	background: url("../img/sec-nav-hover.gif");
+}
+.header-content {
+	padding-bottom: 30px;
+	border-bottom: 1px solid #e0e0e0;
+		-moz-box-shadow: 0 1px 3px #e0e0e0;
+		-webkit-box-shadow: 0 1px 3px #e0e0e0;
+	box-shadow: 0 1px 3px #e0e0e0;
+	margin-bottom: 3px;
+	position: relative;
+	overflow: hidden;
+}
+footer {
+	padding: 10px 10px 40px 10px;
+	position: relative;
+		-moz-border-radius: 0 0 4px 4px;
+		-webkit-border-radius: 0 0 4px 4px;
+	border-radius: 0 0 4px 4px;
+	font-size: 12px;
+	background: url("../img/background-footer.png") repeat scroll 0 0 #f7f6f5;
+}
+footer div {
+	margin: 0 auto;
+    padding: 0 10px;
+    width: 940px;
+}
+footer a {
+	color: #000;
+}
+footer nav ul {
+	margin: 10px 17px 30px 0;
+	width: 172px;
+	display: inline-block;
+	vertical-align: top;
+	height: auto;
+	zoom: 1;
+	*display: inline;
+}
+footer nav ul.last {
+	margin-right: 0;
+}
+footer nav li {
+	margin-bottom: 8px;
+}
+footer nav li:first-child {
+	font-weight: bold;
+}
+footer p {
+	margin-bottom: 0;
+}
+#content {
+	padding-top: 35px;
+}
+.arrow-nav {
+	display: none;
+	position: absolute;
+	top: -1px;
+	z-index: 3;
+}
+.shadow {
+	margin: 30px 0 3px 0;
+	border-bottom: 1px solid #e0e0e0;
+		-moz-box-shadow: 0 2px 3px #e0e0e0;
+		-webkit-box-shadow: 0 2px 3px #e0e0e0;
+	box-shadow: 0 2px 3px #e0e0e0;
+	height: 3px;
+}
+
+/**
+* @section Site-wide
+*/
+
+#content h2{
+	font-size:24px;
+}
+
+.box-orange {
+	padding: 10px;
+	border: 3px solid #dd4814;
+		-moz-border-radius: 4px;
+		-webkit-border-radius: 4px;
+	border-radius: 4px;
+}
+.box-orange .link-action-small {
+	float: right;
+	margin: 0 0 0 20px;
+}
+.link-bug {
+	margin-left: 10px;
+	color: #999;
+}
+.link-action {
+	float: left;
+	margin-bottom: 20px;
+	padding: 8px 12px;
+	display: block;
+	background-color: #dd4814;
+	color: #fff;
+		-moz-border-radius: 20px;
+		-webkit-border-radius: 20px;
+	border-radius: 20px;
+	font-size: 16px;
+	line-height: 1.3;
+	border-top: 3px solid #e6633a;
+	border-bottom: 3px solid #c03d14;
+}
+.link-action2 {
+	float: left;
+	display: block;
+	color: #fff;
+	font-size: 16px;
+	line-height: 1.3;
+}
+.link-action2 span{
+	display:block;
+	float:left;
+}
+.link-action2 .cta-left{
+	background:url(../img/button-cta-left.png) no-repeat;
+	width:22px;
+	height:48px;
+}
+.link-action2 .cta-center{
+	background:url(../img/button-cta-slice.png) repeat-x;
+	line-height:45px;
+	height:48px;
+}
+.link-action2 .cta-right{
+	background:url(../img/button-cta-right.png) no-repeat;
+	width:22px;
+	height:48px;
+}
+
+.link-action-small {
+	float: left;
+	display: block;
+	color: #fff;
+	font-size: 16px;
+}
+.link-action-small span{
+	display:block;
+	float:left;
+	height:42px;
+}
+.link-action-small .cta-left{
+	background:url(../img/button-cta-left-small.png) no-repeat;
+	width:19px;
+}
+.link-action-small .cta-center{
+	background:url(../img/button-cta-slice-small.png) repeat-x;
+	line-height:42px;
+}
+.link-action-small .cta-right{
+	background:url(../img/button-cta-right-small.png) no-repeat;
+	width:19px;
+}
+
+.link-action:active {
+	position: relative;
+	top: 1px;
+}
+.link-action2:active {
+	position: relative;
+	top: 1px;
+}
+.link-action-small:active {
+	position: relative;
+	top: 1px;
+}
+.list-bullets li {
+	margin-bottom: 10px;
+	list-style: disc;
+	list-style-position: inside;
+}
+.box {
+	margin-bottom: 30px;
+	padding: 15px;
+	border: 1px solid #aea79f;
+		-moz-border-radius: 4px;
+		-webkit-border-radius: 4px;
+	border-radius: 4px;
+}
+.box-padded {
+	margin-bottom: 30px;
+	padding: 5px;
+	border: 2px solid #aea79f;
+		-moz-border-radius: 4px;
+		-webkit-border-radius: 4px;
+	border-radius: 4px;
+	background: url("../img/pattern-featured.gif") repeat scroll 0 0 #ebe9e7;
+	overflow: hidden;
+}
+.box-padded h3 {
+	 margin: 5px 0 10px 5px;
+}
+.box-padded div {
+	padding: 10px;
+	border: 1px solid #aea79f;
+		-moz-border-radius: 4px;
+		-webkit-border-radius: 4px;
+	border-radius: 4px;
+	background-color: #fff;
+	overflow: hidden;
+}
+.box-padded li {
+	padding: 0 10px;
+	float: left;
+	width: 211px;
+	border-right: 1px dotted #aea79f;
+}
+.box-padded li.first {
+	padding: 0;
+	margin-bottom: 0;
+}
+.box-padded li.last {
+	border: 0;
+	width: 217px;
+}
+.box-padded img {
+	margin: 0 10px 50px 0;
+	float: left;
+		-moz-border-radius: 8px;
+		-webkit-border-radius: 8px;
+	border-radius: 8px;
+}
+.box-clear {
+	margin-bottom: 40px;
+}
+.box-clear .grid-4.first {
+	margin-right: 15px;
+	padding-right: 15px;
+}
+.box-clear .grid-4 {
+	margin-left: 0;
+	margin-right: 10px;
+	padding-right: 10px;
+	width: 298px;
+}
+.box-clear time {
+	display: block;
+	border-bottom: 1px dotted #aea79f;
+	padding-bottom: 10px;
+	margin-bottom: 10px;
+}
+.box-clear div.first {
+	border-right: 1px dotted #aea79f;
+}
+.box-clear a {
+	display: block;
+}
+.box-clear .rss {
+	background: url("../img/rss.jpg") no-repeat scroll 0 center;
+	padding-left: 20px;
+}
+.box-clear .location {
+	display: block;
+	margin-bottom: 1px;
+}
+.box-clear .last {
+	margin: 0;
+	padding-right: 0;
+		-moz-border-radius: 4px;
+		-webkit-border-radius: 4px;
+	border-radius: 4px;
+	width: 293px;
+}
+
+/* Widgets */
+
+.ui-state-focus {
+	outline: none;
+}
+.ui-accordion {
+	border-bottom: 1px dotted #aea79f;
+}
+.ui-accordion a {
+	display: block;
+}
+.ui-accordion h3 {
+	margin-bottom: 0;
+	border-top: 1px dotted #aea79f;
+	position: relative;
+	font-size: 13px;
+	font-weight: bold;
+}
+.ui-accordion h3 a {
+	padding: 10px 0;
+	color: #333;
+}
+.ui-accordion h4 {
+	margin-bottom: 5px;
+}
+.ui-accordion div fieldset {
+	padding-bottom: 5px;
+}
+.ui-accordion div li,
+.ui-accordion div input {
+	margin-bottom: 10px;
+}
+.ui-accordion .ui-icon {
+	position: absolute;
+	top: 15px;
+	right: 0;
+	display: block;
+	width: 8px;
+	height: 8px;
+	background: url("../img/icon-accordion-inactive.png") 0 0 no-repeat transparent;
+}
+.ui-accordion .ui-state-active .ui-icon {
+	background-image: url("../img/icon-accordion-active.png");
+}
+.ui-accordion .current_page_item a {
+	color: #333;
+}
+.container-tweet {
+		-moz-border-radius: 4px 4px 4px 4px;
+		-webkit-border-radius: 4px 4px 4px 4px;
+	border-radius: 4px 4px 4px 4px;
+	padding: 10px 10px 10px;
+	background-color: #f7f7f7;
+}
+.container-tweet .tweet-follow {
+	margin-top: 10px;
+	margin-bottom: -10px;
+	padding-left: 55px;
+	padding-bottom: 6px;
+	background: url("../img/tweet-follow.png") 0 5px no-repeat;
+	display: block;
+}
+.container-tweet .tweet-follow span {
+	font-size: 16px;
+	font-weight: bold;
+	line-height: 1.2;
+	display: block;
+}
+.tweet a {
+	display: inline;
+}
+.tweet .tweet_text {
+	padding: 10px;
+	background-color: #fff;
+		-moz-border-radius: 4px 4px 4px 4px;
+		-webkit-border-radius: 4px 4px 4px 4px;
+	border-radius: 4px 4px 4px 4px;
+	border: 1px solid #dd4814;
+	font-size: 16px;
+	display: block;
+	clear: both;
+}
+.tweet.tweet-small .tweet_text {
+	font-size: inherit;
+}
+.tweet .tweet_text a {
+	color: #333;
+}
+.tweet .tweet_time,
+.tweet .tweet_user_and_time {
+	padding: 15px 0 10px 0;
+	position: relative;
+	top: -2px;
+	background: url("../img/tweet-arrow.png") no-repeat;
+	display: block;
+}
+.tweet .tweet_odd .tweet_time,
+.tweet .tweet_odd .tweet_user_and_time {
+	background-position: right 0;
+	float: right;
+}
+.tweet .tweet_even .tweet_time,
+.tweet .tweet_even .tweet_user_and_time {
+	background-position: left 0;
+	float: left;
+}
+
+/* Search */
+
+#content .list-search li {
+	list-style-type:none;
+	border:0px;
+	margin-bottom: 15px;
+	padding-top: 15px;
+}
+
+/* Blog */
+
+.blog-article #nav-single {
+	margin-top: 30px;
+	margin-bottom: 30px;
+}
+.blog-article #nav-single .nav-next {
+	float: right;
+}
+.blog-article article header .entry-meta {
+	margin-bottom: 20px;
+}
+.blog-article article .entry-meta {
+	color: #999;
+}
+.blog-article #respond form input[type="submit"] {
+	float: left;
+	cursor: pointer;
+	margin-bottom: 20px;
+	padding: 8px 12px;
+	display: block;
+	background-color: #dd4814;
+	color: #fff;
+		-moz-border-radius: 20px;
+		-webkit-border-radius: 20px;
+	border-radius: 20px;
+	font-size: 16px;
+	line-height: 1.3;
+	border-top: 3px solid #e6633a;
+	border-left: 3px solid #e6633a;
+	border-right: 3px solid #e6633a;
+	border-bottom: 3px solid #c03d14;
+}
+.blog-article #respond form input[type="submit"]:active {
+	position: relative;
+	top: 1px;
+}
+
+.alignnone{
+    float:left;
+    margin:10px 20px 10px 0;
+}
+.alignleft{
+    float:left;
+    margin:10px 20px 10px 0;
+}
+.alignright{
+    float:right;
+   margin:10px 0 10px 20px;
+}
+
+.aligncenter{
+	float:left;
+    margin:10px 20px 10px 0;
+}
+.entry-content h2, .entry-content h3{
+    margin-top:20px;
+}
+.entry-content ul li{
+    list-style-type: circle;
+    margin-left:16px;
+}
+
+.entry-content hr{
+	border:none;
+	border-top: 1px dotted #AEA79F;
+}

=== added file 'doc/css/breadcrumbs.js'
--- doc/css/breadcrumbs.js	1970-01-01 00:00:00 +0000
+++ doc/css/breadcrumbs.js	2015-09-23 12:41:07 +0000
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+$(document).ready(function(){
+    var ul = $("ul.breadcrumb");
+    var li = ul.children("li:has(a)").remove();
+    ul.prepend(li);
+});

=== added file 'doc/css/custom.css'
--- doc/css/custom.css	1970-01-01 00:00:00 +0000
+++ doc/css/custom.css	2015-09-23 12:41:07 +0000
@@ -0,0 +1,11 @@
+li#buildversion {
+    display: none;
+}
+
+div.toc {
+    display: none;
+}
+
+span.type a:visited {
+    color: #dd4814;
+}

=== added file 'doc/css/qtquick.css'
--- doc/css/qtquick.css	1970-01-01 00:00:00 +0000
+++ doc/css/qtquick.css	2015-09-23 12:41:07 +0000
@@ -0,0 +1,788 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+@media screen
+{
+
+/* basic elements */
+    html
+    {
+        color: #000000;
+        background: #FFFFFF;
+    }
+    table
+    {
+        border-collapse: collapse;
+        border-spacing: 0;
+    }
+    fieldset, img
+    {
+        border: 0;
+        max-width:100%;
+    }
+    address, caption, cite, code, dfn, em, strong, th, var, optgroup
+    {
+        font-style: inherit;
+        font-weight: inherit;
+    }
+    del, ins
+    {
+        text-decoration: none;
+    }
+    ol li
+    {
+        list-style: decimal;
+    }
+    ul li
+    {
+        list-style: none;
+    }
+    caption, th
+    {
+        text-align: left;
+    }
+    h1.title
+    {
+        font-weight: bold;
+        font-size: 150%;
+    }
+    h0
+    {
+        font-weight: bold;
+        font-size: 130%;
+    }
+    h1, h2, h3, h4, h5, h6
+    {
+        font-size: 100%;
+    }
+    q:before, q:after
+    {
+        content: '';
+    }
+    abbr, acronym
+    {
+        border: 0;
+        font-variant: normal;
+    }
+    sup, sub
+    {
+        vertical-align: baseline;
+    }
+    tt, .qmlreadonly span, .qmldefault span
+    {
+        word-spacing:0.5em;
+    }
+    legend
+    {
+        color: #000000;
+    }
+    strong
+    {
+        font-weight: bold;
+    }
+    em
+    {
+        font-style: italic;
+    }
+
+    body
+    {
+        margin: 0 1.5em 0 1.5em;
+        font-family: ubuntu;
+        line-height: normal
+    }
+    a
+    {
+        color: #00732F;
+        text-decoration: none;
+    }
+    hr
+    {
+        background-color: #E6E6E6;
+        border: 1px solid #E6E6E6;
+        height: 1px;
+        width: 100%;
+        text-align: left;
+        margin: 1.5em 0 1.5em 0;
+    }
+
+    pre
+    {
+        border: 1px solid #DDDDDD;
+        -moz-border-radius: 0.7em 0.7em 0.7em 0.7em;
+        -webkit-border-radius: 0.7em 0.7em 0.7em 0.7em;
+        border-radius: 0.7em 0.7em 0.7em 0.7em;
+        padding: 1em 1em 1em 1em;
+        overflow-x: auto;
+    }
+    table, pre
+    {
+        -moz-border-radius: 0.7em 0.7em 0.7em 0.7em;
+        -webkit-border-radius: 0.7em 0.7em 0.7em 0.7em;
+        border-radius: 0.7em 0.7em 0.7em 0.7em;
+        background-color: #F6F6F6;
+        border: 1px solid #E6E6E6;
+        border-collapse: separate;
+        margin-bottom: 2.5em;
+    }
+    pre {
+        font-size: 90%;
+        display: block;
+        overflow:hidden;
+    }
+    thead
+    {
+        margin-top: 0.5em;
+        font-weight: bold
+    }
+    th
+    {
+        padding: 0.5em 1.5em 0.5em 1em;
+        background-color: #E1E1E1;
+        border-left: 1px solid #E6E6E6;
+    }
+    td
+    {
+        padding: 0.25em 1.5em 0.25em 1em;
+    }
+
+    td.rightAlign
+    {
+        padding: 0.25em 0.5em 0.25em 1em;
+    }
+    table tr.odd
+    {
+        border-left: 1px solid #E6E6E6;
+        background-color: #F6F6F6;
+        color: black;
+    }
+    table tr.even
+    {
+        border-left: 1px solid #E6E6E6;
+        background-color: #ffffff;
+        color: #202020;
+    }
+
+    div.float-left
+    {
+        float: left; margin-right: 2em
+    }
+    div.float-right
+    {
+        float: right; margin-left: 2em
+    }
+
+    span.comment
+    {
+        color: #008B00;
+    }
+    span.string, span.char
+    {
+        color: #000084;
+    }
+    span.number
+    {
+        color: #a46200;
+    }
+    span.operator
+    {
+        color: #202020;
+    }
+    span.keyword
+    {
+        color: #840000;
+    }
+    span.name
+    {
+        color: black
+    }
+    span.type
+    {
+        font-weight: bold
+    }
+    span.type a:visited
+    {
+        color: #0F5300;
+    }
+    span.preprocessor
+    {
+        color: #404040
+    }
+/* end basic elements */
+
+/* font style elements */
+    .heading
+    {
+        font-weight: bold;
+        font-size: 125%;
+    }
+    .subtitle
+    {
+        font-size: 110%
+    }
+    .small-subtitle
+    {
+        font-size: 100%
+    }
+    .red
+    {
+        color:red;
+    }
+/* end font style elements */
+
+/* global settings*/
+    .header, .footer
+    {
+        display: block;
+        clear: both;
+        overflow: hidden;
+    }
+/* end global settings*/
+
+/* header elements */
+    .header .qtref
+    {
+        color: #00732F;
+        font-weight: bold;
+        font-size: 130%;
+    }
+
+    .header .content
+    {
+        margin-left: 5px;
+        margin-top: 5px;
+        margin-bottom: 0.5em;
+    }
+
+    .header .breadcrumb
+    {
+        font-size: 90%;
+        padding: 0.5em 0 0.5em 1em;
+        margin: 0;
+        background-color: #fafafa;
+        height: 1.35em;
+        border-bottom: 1px solid #d1d1d1;
+    }
+
+    .header .breadcrumb ul
+    {
+        margin: 0;
+        padding: 0;
+    }
+
+    .header .content
+    {
+        word-wrap: break-word;
+    }
+
+    .header .breadcrumb ul li
+    {
+        float: left;
+        background: url(../images/breadcrumb.png) no-repeat 0 3px;
+        padding-left: 1.5em;
+        margin-left: 1.5em;
+    }
+
+    .header .breadcrumb ul li.last
+    {
+        font-weight: normal;
+    }
+
+    .header .breadcrumb ul li a
+    {
+        color: #00732F;
+    }
+
+    .header .breadcrumb ul li.first
+    {
+        background-image: none;
+        padding-left: 0;
+        margin-left: 0;
+    }
+
+    .header .content ol li {
+        background: none;
+        margin-bottom: 1.0em;
+        margin-left: 1.2em;
+        padding-left: 0
+    }
+
+    .header .content li
+    {
+        background: url(../images/bullet_sq.png) no-repeat 0 5px;
+        margin-bottom: 1em;
+        padding-left: 1.2em;
+    }
+
+/* end header elements */
+
+/* content elements */
+    .content h1
+    {
+        font-weight: bold;
+        font-size: 130%
+    }
+
+    .content h2
+    {
+        font-weight: bold;
+        font-size: 120%;
+        width: 100%;
+    }
+    .content h3
+    {
+        font-weight: bold;
+        font-size: 110%;
+        width: 100%;
+    }
+    .content table p
+    {
+        margin: 0
+    }
+    .content ul
+    {
+        padding-left: 2.5em;
+    }
+    .content li
+    {
+        padding-top: 0.25em;
+        padding-bottom: 0.25em;
+    }
+    .content ul img {
+        vertical-align: middle;
+    }
+
+    .content a:visited
+    {
+        color: #4c0033;
+        text-decoration: none;
+    }
+
+    .content a:visited:hover
+    {
+        color: #4c0033;
+        text-decoration: underline;
+    }
+
+    a:hover
+    {
+        color: #4c0033;
+        text-decoration: underline;
+    }
+    descr p a
+    {
+        text-decoration: underline;
+    }
+
+    .descr p a:visited
+    {
+        text-decoration: underline;
+    }
+
+    .alphaChar{
+        width:95%;
+        background-color:#F6F6F6;
+        border:1px solid #E6E6E6;
+        -moz-border-radius: 7px 7px 7px 7px;
+        border-radius: 7px 7px 7px 7px;
+        -webkit-border-radius: 7px 7px 7px 7px;
+        font-size:12pt;
+        padding-left:10px;
+        margin-top:10px;
+        margin-bottom:10px;
+    }
+    .flowList{
+        /*vertical-align:top;*/
+        /*margin:20px auto;*/
+
+        column-count:3;
+        -webkit-column-count:3;
+        -moz-column-count:3;
+/*
+        column-width:100%;
+        -webkit-column-width:200px;
+        -col-column-width:200px;
+*/
+        column-gap:41px;
+        -webkit-column-gap:41px;
+        -moz-column-gap:41px;
+
+        column-rule: 1px dashed #ccc;
+        -webkit-column-rule: 1px dashed #ccc;
+        -moz-column-rule: 1px dashed #ccc;
+    }
+
+    .flowList dl{
+    }
+    .flowList dd{
+        /*display:inline-block;*/
+        margin-left:10px;
+        min-width:250px;
+        line-height: 1.5;
+        min-width:100%;
+        min-height:15px;
+    }
+
+    .flowList dd a{
+    }
+
+    .mainContent
+    {
+        padding-left:5px;
+    }
+
+    .content .flowList p{
+        padding:0px;
+    }
+
+    .content .alignedsummary
+    {
+        margin: 15px;
+    }
+
+
+    .qmltype
+    {
+        text-align: center;
+        font-size: 120%;
+    }
+    .qmlreadonly
+    {
+        padding-left: 5px;
+        float: right;
+        color: #254117;
+    }
+
+    .qmldefault
+    {
+        padding-left: 5px;
+        float: right;
+        color: red;
+    }
+
+    .qmldoc
+    {
+    }
+
+    .generic .alphaChar{
+        margin-top:5px;
+    }
+
+    .generic .odd .alphaChar{
+        background-color: #F6F6F6;
+    }
+
+    .generic .even .alphaChar{
+        background-color: #FFFFFF;
+    }
+
+    .memItemRight{
+        padding: 0.25em 1.5em 0.25em 0;
+    }
+    .highlightedCode
+    {
+        margin: 1.0em;
+    }
+    .annotated td {
+        padding: 0.25em 0.5em 0.25em 0.5em;
+    }
+
+    .toc
+    {
+        font-size: 80%
+    }
+
+    .header .content .toc ul
+    {
+        padding-left: 0px;
+    }
+
+    .content .toc h3 {
+        border-bottom: 0px;
+        margin-top: 0px;
+    }
+
+    .content .toc h3 a:hover {
+        color: #00732F;
+        text-decoration: none;
+    }
+
+    .content .toc .level2
+    {
+        margin-left: 1.5em;
+    }
+
+    .content .toc .level3
+    {
+        margin-left: 3.0em;
+    }
+
+    .content ul li
+    {
+        background: url(../images/bullet_sq.png) no-repeat 0 0.7em;
+        padding-left: 1em
+    }
+
+    .content .toc li
+    {
+        background: url(../images/bullet_dn.png) no-repeat 0 5px;
+        padding-left: 1em
+    }
+
+    .relpage
+    {
+        -moz-border-radius: 7px 7px 7px 7px;
+        -webkit-border-radius: 7px 7px 7px 7px;
+        border-radius: 7px 7px 7px 7px;
+        border: 1px solid #DDDDDD;
+        padding: 25px 25px;
+        clear: both;
+    }
+    .relpage ul
+    {
+        float: none;
+        padding: 1.5em;
+    }
+
+    h3.fn, span.fn
+    {
+        -moz-border-radius:7px 7px 7px 7px;
+        -webkit-border-radius:7px 7px 7px 7px;
+        border-radius:7px 7px 7px 7px;
+        background-color: #F6F6F6;
+        border-width: 1px;
+        border-style: solid;
+        border-color: #E6E6E6;
+        font-weight: bold;
+        word-spacing:3px;
+        padding:3px 5px;
+    }
+
+    .functionIndex {
+        font-size:12pt;
+        word-spacing:10px;
+        margin-bottom:10px;
+        background-color: #F6F6F6;
+        border-width: 1px;
+        border-style: solid;
+        border-color: #E6E6E6;
+        -moz-border-radius: 7px 7px 7px 7px;
+        -webkit-border-radius: 7px 7px 7px 7px;
+        border-radius: 7px 7px 7px 7px;
+        width:100%;
+    }
+
+    .centerAlign
+    {
+        text-align:center;
+    }
+
+    .rightAlign
+    {
+        text-align:right;
+    }
+
+    .leftAlign
+    {
+        text-align:left;
+    }
+
+    .topAlign{
+        vertical-align:top
+    }
+
+    .functionIndex a{
+        display:inline-block;
+    }
+
+/* end content elements */
+/* footer elements */
+
+    .footer
+    {
+        color: #393735;
+        font-size: 0.75em;
+        text-align: center;
+        padding-top: 1.5em;
+        padding-bottom: 1em;
+        background-color: #E6E7E8;
+        margin: 0;
+    }
+    .footer p
+    {
+        margin: 0.25em
+    }
+    .small
+    {
+        font-size: 0.5em;
+    }
+/* end footer elements */
+
+    .item {
+      float: left;
+      position: relative;
+      width: 100%;
+      overflow: hidden;
+    }
+
+
+    .item .primary {
+      margin-right: 220px;
+      position: relative;
+    }
+
+    .item hr {
+      margin-left: -220px;
+    }
+
+    .item .secondary {
+      float: right;
+      width: 200px;
+      position: relative;
+    }
+
+    .item .cols {
+      clear: both;
+      display: block;
+    }
+
+    .item .cols .col {
+      float: left;
+      margin-left: 1.5%;
+    }
+
+    .item .cols .col.first {
+      margin-left: 0;
+    }
+
+    .item .cols.two .col {
+      width: 45%;
+    }
+
+    .item .box {
+      margin: 0 0 10px 0;
+    }
+
+    .item .box h3 {
+      margin: 0 0 10px 0;
+    }
+
+    .cols.unclear {
+        clear:none;
+    }
+}
+
+/* end of screen media */
+
+/* start of print media */
+
+@media print
+{
+    input, textarea, .header, .footer, .toolbar, .feedback, .wrapper .hd, .wrapper .bd .sidebar, .wrapper .ft, #feedbackBox, #blurpage, .toc, .breadcrumb, .toolbar, .floatingResult
+    {
+        display: none;
+        background: none;
+    }
+    .content
+    {
+        background: none;
+        display: block;
+        width: 100%; margin: 0; float: none;
+    }
+}
+/* end of print media */
+
+
+/* modify the TOC layouts */
+div.toc ul {
+    padding-left: 20px;
+}
+div.toc li {
+    padding-left: 4px;
+}
+/* Remove the border around images*/
+a img
+{
+    border:none;
+}
+
+/*Add styling to the front pages*/
+
+.threecolumn_area
+{
+    padding-top: 20px;
+    padding-bottom: 20px;
+}
+.threecolumn_piece
+{
+    display: inline-block;
+    margin-left: 78px;
+    margin-top: 8px;
+    padding: 0;
+    vertical-align: top;
+    width: 25.5%;
+}
+div.threecolumn_piece ul {
+    list-style-type: none;
+    padding-left: 0px;
+    margin-top: 2px;
+}
+div.threecolumn_piece p {
+    margin-bottom: 7px;
+    color: #5C626E;
+    text-decoration: none;
+    font-weight: bold;
+}
+div.threecolumn_piece li {
+    padding-left: 0px;
+    margin-bottom: 5px;
+}
+div.threecolumn_piece a {
+    font-weight: normal;
+}
+/* Add style to guide page*/
+.fourcolumn_area
+{
+    padding-top: 20px;
+    padding-bottom: 20px;
+}
+.fourcolumn_piece
+{
+    display: inline-block;
+    margin-left: 35px;
+    margin-top: 8px;
+    padding: 0;
+    vertical-align: top;
+    width: 21.3%;
+}
+div.fourcolumn_piece ul {
+    list-style-type: none;
+    padding-left: 0px;
+    margin-top: 2px;
+}
+div.fourcolumn_piece p {
+    margin-bottom: 7px;
+    color: #40444D;
+    text-decoration: none;
+    font-weight: bold;
+}
+div.fourcolumn_piece li {
+    padding-left: 0px;
+    margin-bottom: 5px;
+}
+div.fourcolumn_piece a {
+    font-weight: normal;
+}

=== added file 'doc/css/reset.css'
--- doc/css/reset.css	1970-01-01 00:00:00 +0000
+++ doc/css/reset.css	2015-09-23 12:41:07 +0000
@@ -0,0 +1,8 @@
+/*
+Copyright (c) 2010, Yahoo! Inc. All rights reserved.
+Code licensed under the BSD License:
+http://developer.yahoo.com/yui/license.html
+version: 3.3.0
+build: 3167
+*/
+html{color:#000;background:#FFF;}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td{margin:0;padding:0;}table{border-collapse:collapse;border-spacing:0;}fieldset,img{border:0;}address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:normal;}li{list-style:none;}caption,th{text-align:left;}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal;}q:before,q:after{content:'';}abbr,acronym{border:0;font-variant:normal;}sup{vertical-align:text-top;}sub{vertical-align:text-bottom;}input,textarea,select{font-family:inherit;font-size:inherit;font-weight:inherit;}input,textarea,select{*font-size:100%;}legend{color:#000;}
\ No newline at end of file

=== added file 'doc/css/scratch.css'
--- doc/css/scratch.css	1970-01-01 00:00:00 +0000
+++ doc/css/scratch.css	2015-09-23 12:41:07 +0000
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+body {
+	margin: 0;
+}
+div.toc ul {
+	padding: 0;
+}
+div.toc li {
+	margin-bottom: 3px;
+}
+h1.title {
+	font-size: 36px;
+	line-height: 1.1;
+	font-weight: normal;
+}
+h0, h2 {
+	font-size: 24px;
+	line-height: 1.2;
+	margin: 14px 0;
+	font-weight: normal;
+	display: block;
+}
+a:hover {
+	color: #dd4814;
+	text-decoration: underline;
+	outline: 0;
+}
+table, pre {
+	border-radius: 0;
+        white-space: pre-wrap;
+}
+.annotated td {
+	padding: 0.8em 1em 0.3em;
+}
+.wrapper {
+	width: 940px;
+	margin: 0 auto;
+}
+.main-content {
+	width: 668px;
+	position: relative;
+	left: 270px;
+}
+.title {
+	margin-left: -270px;
+	margin-top: 30px;
+	margin-bottom: 50px;
+}
+.toc {
+	margin-left: -270px;
+	font-size: 100%;
+	margin-bottom: 40px;
+    padding: 0;
+    z-index: 2;
+    position: absolute;
+    top: 100px;
+    width: 250px;
+}
+.breadcrumb {
+	position: relative;
+	left: -270px;
+	top: 30px;
+	width: auto;
+	padding-bottom: 30px;
+	margin-bottom: 30px;
+	float:left;
+}
+.breadcrumb li {
+	float: left;
+	margin-right: 8px;
+}
+.breadcrumb a:link,
+.breadcrumb a:visited {
+	color: #AEA79F;
+}
+.breadcrumb a:after {
+	content: '\0000a0\0000a0 >';
+}
+.title {
+	margin-top: 50px;
+	clear:both;
+}
+.breadcrumb + .toc {
+	top: 170px;
+}
+.breadcrumb p {
+    display: inline;
+}
+

=== added file 'doc/ubuntu-onlineaccounts2.qdocconf'
--- doc/ubuntu-onlineaccounts2.qdocconf	1970-01-01 00:00:00 +0000
+++ doc/ubuntu-onlineaccounts2.qdocconf	2015-09-23 12:41:07 +0000
@@ -0,0 +1,21 @@
+project = UbuntuOnlineAccounts2
+description = Ubuntu.OnlineAccounts 2.0 module documentation
+sourcedirs = ./ ../src/lib/Ubuntu/OnlineAccounts.2/
+sources.fileextensions = "*.qdoc *.cpp"
+outputdir = html
+outputformats = HTML
+version = 0.2
+syntaxhightlighting = true
+sourceencoding = UTF-8
+outputencoding = UTF-8
+
+HTML.nonavigationbar = "true"
+HTML.stylesheets = \
+    css/base.css \
+    css/qtquick.css \
+    css/reset.css \
+    css/scratch.css
+HTML.headerstyles = \
+    "<link rel=\"stylesheet\" type=\"text/css\" href=\"style/reset.css\" />\n" \
+    "<link rel=\"stylesheet\" type=\"text/css\" href=\"style/qtquick.css\" />\n" \
+    "<link rel=\"stylesheet\" type=\"text/css\" href=\"style/base.css\" />\n"

=== added file 'src/daemon/CMakeLists.txt'
--- src/daemon/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/daemon/CMakeLists.txt	2015-09-23 12:41:07 +0000
@@ -0,0 +1,27 @@
+project(accountd)
+
+set(ACCOUNTD accountd)
+
+include_directories(.
+    ${OnlineAccountsDaemon_SOURCE_DIR}/..
+)
+
+add_executable(${ACCOUNTD}
+    inactivity_timer.cpp
+    main.cpp
+)
+qt5_use_modules(${ACCOUNTD} DBus)
+target_link_libraries(${ACCOUNTD}
+    OnlineAccountsDaemon
+)
+set_target_properties(${ACCOUNTD} PROPERTIES AUTOMOC TRUE)
+
+install(TARGETS ${ACCOUNTD}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+)
+
+set(SERVICE_FILE com.ubuntu.OnlineAccounts.Manager.service)
+configure_file(${SERVICE_FILE}.in ${SERVICE_FILE})
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${SERVICE_FILE}
+    DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1/services
+)

=== modified file 'src/daemon/main.cpp'
--- src/daemon/main.cpp	2015-07-10 11:33:58 +0000
+++ src/daemon/main.cpp	2015-09-23 12:41:07 +0000
@@ -22,7 +22,7 @@
 #include <QDBusConnection>
 #include <QProcessEnvironment>
 #include "inactivity_timer.h"
-#include "manager.h"
+#include "OnlineAccountsDaemon/Manager"
 
 int main(int argc, char **argv)
 {
@@ -42,7 +42,7 @@
             daemonTimeout = value;
     }
 
-    auto manager = new OnlineAccountsDaemon::Manager();
+    auto manager = (QObject *)oad_create_manager(0);
 
     auto inactivityTimer =
         new OnlineAccountsDaemon::InactivityTimer(daemonTimeout * 1000);

=== modified file 'src/lib/OnlineAccounts/CMakeLists.txt'
--- src/lib/OnlineAccounts/CMakeLists.txt	2015-07-21 09:32:19 +0000
+++ src/lib/OnlineAccounts/CMakeLists.txt	2015-09-23 12:41:07 +0000
@@ -6,6 +6,7 @@
     ${OnlineAccountsDaemon_SOURCE_DIR}/..
 )
 set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined")
+set(CMAKE_CXX_VISIBILITY_PRESET hidden)
 
 add_library(${CLIENT_LIB} SHARED
     account.cpp

=== modified file 'src/lib/OnlineAccounts/account.cpp'
--- src/lib/OnlineAccounts/account.cpp	2015-03-04 10:01:32 +0000
+++ src/lib/OnlineAccounts/account.cpp	2015-09-23 12:41:07 +0000
@@ -96,6 +96,12 @@
     return d->m_info.authenticationMethod();
 }
 
+QStringList Account::keys() const
+{
+    Q_D(const Account);
+    return d->m_info.keys();
+}
+
 QVariant Account::setting(const QString &key) const
 {
     Q_D(const Account);

=== modified file 'src/lib/OnlineAccounts/account.h'
--- src/lib/OnlineAccounts/account.h	2015-02-27 10:28:50 +0000
+++ src/lib/OnlineAccounts/account.h	2015-09-23 12:41:07 +0000
@@ -48,6 +48,7 @@
     QString serviceId() const;
     AuthenticationMethod authenticationMethod() const;
 
+    QStringList keys() const;
     QVariant setting(const QString &key) const;
 
     PendingCall authenticate(const AuthenticationData &authData);

=== modified file 'src/lib/OnlineAccounts/account_info.h'
--- src/lib/OnlineAccounts/account_info.h	2015-05-26 14:23:10 +0000
+++ src/lib/OnlineAccounts/account_info.h	2015-09-23 12:41:07 +0000
@@ -23,7 +23,7 @@
 
 #include <QVariantMap>
 
-#include "daemon/dbus_constants.h"
+#include "OnlineAccountsDaemon/dbus_constants.h"
 #include "global.h"
 
 class QDBusArgument;
@@ -59,6 +59,15 @@
         }
     }
 
+    QStringList keys() const {
+        QStringList settingKeys;
+        Q_FOREACH(const QString &key, details.keys()) {
+            if (key.startsWith(ONLINE_ACCOUNTS_INFO_KEY_SETTINGS)) {
+                settingKeys.append(key.mid(sizeof(ONLINE_ACCOUNTS_INFO_KEY_SETTINGS) - 1));
+            }
+        }
+        return settingKeys;
+    }
     QVariant setting(const QString &key) const {
         return details.value(ONLINE_ACCOUNTS_INFO_KEY_SETTINGS + key);
     }

=== modified file 'src/lib/OnlineAccounts/authentication_data.cpp'
--- src/lib/OnlineAccounts/authentication_data.cpp	2015-05-26 14:23:10 +0000
+++ src/lib/OnlineAccounts/authentication_data.cpp	2015-09-23 12:41:07 +0000
@@ -21,7 +21,7 @@
 #include "authentication_data_p.h"
 
 #include <QDBusMetaType>
-#include "daemon/dbus_constants.h"
+#include "OnlineAccountsDaemon/dbus_constants.h"
 
 using namespace OnlineAccounts;
 
@@ -32,6 +32,11 @@
 {
 }
 
+AuthenticationData::AuthenticationData(AuthenticationMethod method):
+    d(new AuthenticationDataPrivate(method))
+{
+}
+
 AuthenticationData::AuthenticationData(AuthenticationDataPrivate *priv):
     d(priv)
 {
@@ -71,6 +76,16 @@
     return d->m_invalidateCachedReply;
 }
 
+void AuthenticationData::setParameters(const QVariantMap &parameters)
+{
+    d->m_parameters = parameters;
+}
+
+QVariantMap AuthenticationData::parameters() const
+{
+    return d->m_parameters;
+}
+
 /* OAuth 2.0 */
 
 OAuth2Data::OAuth2Data():

=== modified file 'src/lib/OnlineAccounts/authentication_data.h'
--- src/lib/OnlineAccounts/authentication_data.h	2015-03-04 11:36:09 +0000
+++ src/lib/OnlineAccounts/authentication_data.h	2015-09-23 12:41:07 +0000
@@ -37,6 +37,7 @@
 class ONLINE_ACCOUNTS_EXPORT AuthenticationData
 {
 public:
+    AuthenticationData(AuthenticationMethod method);
     AuthenticationData(const AuthenticationData &other);
     virtual ~AuthenticationData();
 
@@ -48,6 +49,9 @@
     void invalidateCachedReply();
     bool mustInvalidateCachedReply() const;
 
+    void setParameters(const QVariantMap &parameters);
+    QVariantMap parameters() const;
+
 protected:
     AuthenticationData(AuthenticationDataPrivate *priv);
     QSharedDataPointer<AuthenticationDataPrivate> d;
@@ -55,7 +59,6 @@
 private:
     friend class Manager;
     friend class ManagerPrivate;
-    AuthenticationData();
 };
 
 class AuthenticationReplyPrivate;
@@ -68,6 +71,8 @@
     bool hasError() const { return error().isValid(); }
     Error error() const;
 
+    QVariantMap data() const;
+
 protected:
     AuthenticationReply(AuthenticationReplyPrivate *priv);
     AuthenticationReplyPrivate *d_ptr;

=== modified file 'src/lib/OnlineAccounts/authentication_reply.cpp'
--- src/lib/OnlineAccounts/authentication_reply.cpp	2015-05-26 14:23:10 +0000
+++ src/lib/OnlineAccounts/authentication_reply.cpp	2015-09-23 12:41:07 +0000
@@ -23,7 +23,7 @@
 #include <QDBusArgument>
 #include <QDBusMessage>
 #include <QDebug>
-#include "daemon/dbus_constants.h"
+#include "OnlineAccountsDaemon/dbus_constants.h"
 #include "error_p.h"
 #include "pending_call_p.h"
 
@@ -153,6 +153,12 @@
     return d->m_error;
 }
 
+QVariantMap AuthenticationReply::data() const
+{
+    Q_D(const AuthenticationReply);
+    return d->data();
+}
+
 /* OAuth 2.0 */
 
 OAuth2Reply::OAuth2Reply(const PendingCall &call):

=== modified file 'src/lib/OnlineAccounts/error.cpp'
--- src/lib/OnlineAccounts/error.cpp	2015-05-26 14:23:10 +0000
+++ src/lib/OnlineAccounts/error.cpp	2015-09-23 12:41:07 +0000
@@ -21,7 +21,7 @@
 #include "error_p.h"
 
 #include <QDBusError>
-#include "daemon/dbus_constants.h"
+#include "OnlineAccountsDaemon/dbus_constants.h"
 
 namespace OnlineAccounts {
 

=== modified file 'src/lib/OnlineAccounts/manager.cpp'
--- src/lib/OnlineAccounts/manager.cpp	2015-05-26 14:23:10 +0000
+++ src/lib/OnlineAccounts/manager.cpp	2015-09-23 12:41:07 +0000
@@ -26,7 +26,7 @@
 #include <QDebug>
 #include "account_p.h"
 #include "authentication_data_p.h"
-#include "daemon/dbus_constants.h"
+#include "OnlineAccountsDaemon/dbus_constants.h"
 #include "pending_call_p.h"
 
 using namespace OnlineAccounts;

=== added directory 'src/lib/OnlineAccountsDaemon'
=== renamed file 'src/daemon/CMakeLists.txt' => 'src/lib/OnlineAccountsDaemon/CMakeLists.txt'
--- src/daemon/CMakeLists.txt	2015-07-08 11:13:00 +0000
+++ src/lib/OnlineAccountsDaemon/CMakeLists.txt	2015-09-23 12:41:07 +0000
@@ -4,7 +4,10 @@
 pkg_check_modules(OACLIENT OnlineAccountsClient REQUIRED)
 pkg_check_modules(SIGNONQT libsignon-qt5 REQUIRED)
 
-set(ACCOUNTD accountd)
+set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined")
+set(CMAKE_CXX_VISIBILITY_PRESET hidden)
+
+set(ACCOUNTD_LIB OnlineAccountsDaemon)
 
 include_directories(. ${CMAKE_CURRENT_BINARY_DIR})
 add_definitions(
@@ -14,40 +17,37 @@
     ${SIGNONQT_CFLAGS}
 )
 
-add_executable(${ACCOUNTD}
+add_library(${ACCOUNTD_LIB} SHARED
     access_request.cpp
     async_operation.cpp
     authentication_request.cpp
     authenticator.cpp
     client_registry.cpp
-    inactivity_timer.cpp
-    main.cpp
     manager.cpp
     manager_adaptor.cpp
     state_saver.cpp
 )
-qt5_use_modules(${ACCOUNTD} DBus)
-target_link_libraries(${ACCOUNTD}
+#set_target_properties(${ACCOUNTD_LIB} PROPERTIES
+#    VERSION 1.0.0
+#    SOVERSION 1
+#)
+qt5_use_modules(${ACCOUNTD_LIB} DBus)
+target_link_libraries(${ACCOUNTD_LIB}
     ${ACCOUNTSQT_LDFLAGS}
     ${APPARMOR_LDFLAGS}
     ${OACLIENT_LDFLAGS}
     ${SIGNONQT_LDFLAGS}
 )
-set_target_properties(${ACCOUNTD} PROPERTIES AUTOMOC TRUE)
-
-install(TARGETS ${ACCOUNTD}
-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-)
-
-set(SERVICE_FILE com.ubuntu.OnlineAccounts.Manager.service)
-configure_file(${SERVICE_FILE}.in ${SERVICE_FILE})
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${SERVICE_FILE}
-    DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1/services
+set_target_properties(${ACCOUNTD_LIB} PROPERTIES AUTOMOC TRUE)
+
+# Install
+
+install(TARGETS ${ACCOUNTD_LIB}
+	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
 )
 
 # Development files
 
-set(ACCOUNTD_LIB OnlineAccountsDaemon)
 configure_file(${ACCOUNTD_LIB}.pc.in ${ACCOUNTD_LIB}.pc @ONLY)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${ACCOUNTD_LIB}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
 

=== added file 'src/lib/OnlineAccountsDaemon/Manager'
--- src/lib/OnlineAccountsDaemon/Manager	1970-01-01 00:00:00 +0000
+++ src/lib/OnlineAccountsDaemon/Manager	2015-09-23 12:41:07 +0000
@@ -0,0 +1,1 @@
+#include "manager.h"

=== renamed file 'src/daemon/OnlineAccountsDaemon.pc.in' => 'src/lib/OnlineAccountsDaemon/OnlineAccountsDaemon.pc.in'
--- src/daemon/OnlineAccountsDaemon.pc.in	2015-07-08 11:13:00 +0000
+++ src/lib/OnlineAccountsDaemon/OnlineAccountsDaemon.pc.in	2015-09-23 12:41:07 +0000
@@ -6,4 +6,6 @@
 Name: @ACCOUNTD_LIB@
 Description: Binding development files for the Online Accounts simplified API
 Version: @PROJECT_VERSION@
-Cflags: -I${includedir}/@ACCOUNTD_LIB@
+Requires: Qt5Core
+Libs: -L${libdir} -l@ACCOUNTD_LIB@
+Cflags: -I${includedir}/

=== renamed file 'src/daemon/access_request.cpp' => 'src/lib/OnlineAccountsDaemon/access_request.cpp'
=== renamed file 'src/daemon/access_request.h' => 'src/lib/OnlineAccountsDaemon/access_request.h'
=== renamed file 'src/daemon/account_info.h' => 'src/lib/OnlineAccountsDaemon/account_info.h'
=== renamed file 'src/daemon/async_operation.cpp' => 'src/lib/OnlineAccountsDaemon/async_operation.cpp'
=== renamed file 'src/daemon/async_operation.h' => 'src/lib/OnlineAccountsDaemon/async_operation.h'
=== renamed file 'src/daemon/authentication_request.cpp' => 'src/lib/OnlineAccountsDaemon/authentication_request.cpp'
=== renamed file 'src/daemon/authentication_request.h' => 'src/lib/OnlineAccountsDaemon/authentication_request.h'
=== renamed file 'src/daemon/authenticator.cpp' => 'src/lib/OnlineAccountsDaemon/authenticator.cpp'
=== renamed file 'src/daemon/authenticator.h' => 'src/lib/OnlineAccountsDaemon/authenticator.h'
=== renamed file 'src/daemon/client_registry.cpp' => 'src/lib/OnlineAccountsDaemon/client_registry.cpp'
=== renamed file 'src/daemon/client_registry.h' => 'src/lib/OnlineAccountsDaemon/client_registry.h'
=== renamed file 'src/daemon/com.ubuntu.OnlineAccounts.Manager.xml' => 'src/lib/OnlineAccountsDaemon/com.ubuntu.OnlineAccounts.Manager.xml'
=== renamed file 'src/daemon/dbus_constants.h' => 'src/lib/OnlineAccountsDaemon/dbus_constants.h'
=== added file 'src/lib/OnlineAccountsDaemon/global.h'
--- src/lib/OnlineAccountsDaemon/global.h	1970-01-01 00:00:00 +0000
+++ src/lib/OnlineAccountsDaemon/global.h	2015-09-23 12:41:07 +0000
@@ -0,0 +1,32 @@
+/*
+ * This file is part of libOnlineAccountsDaemon
+ *
+ * Copyright (C) 2015 Canonical Ltd.
+ *
+ * Contact: Alberto Mardegan <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3, as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef ONLINE_ACCOUNTS_DAEMON_GLOBAL_H
+#define ONLINE_ACCOUNTS_DAEMON_GLOBAL_H
+
+#include <QtGlobal>
+
+#if defined(BUILDING_ONLINE_ACCOUNTS_DAEMON)
+#  define OAD_EXPORT Q_DECL_EXPORT
+#else
+#  define OAD_EXPORT Q_DECL_IMPORT
+#endif
+
+#endif // ONLINE_ACCOUNTS_DAEMON_GLOBAL_H

=== renamed file 'src/daemon/manager.cpp' => 'src/lib/OnlineAccountsDaemon/manager.cpp'
--- src/daemon/manager.cpp	2015-08-20 09:43:52 +0000
+++ src/lib/OnlineAccountsDaemon/manager.cpp	2015-09-23 12:41:07 +0000
@@ -343,6 +343,16 @@
 
     info[ONLINE_ACCOUNTS_INFO_KEY_AUTH_METHOD] = authMethod(as->authData());
     QString settingsPrefix(QStringLiteral(ONLINE_ACCOUNTS_INFO_KEY_SETTINGS));
+    /* First, read the global settings */
+    Accounts::Account *a = as->account();
+    a->selectService();
+    Q_FOREACH(const QString &key, a->allKeys()) {
+        if (key == "enabled" || key == "CredentialsId" || key == "name" ||
+            key.startsWith("auth/")) continue;
+        info[settingsPrefix + key] = a->value(key);
+    }
+
+    /* Then, add service-specific settings */
     Q_FOREACH(const QString &key, as->allKeys()) {
         if (key == "enabled") continue;
         info[settingsPrefix + key] = as->value(key);
@@ -590,4 +600,9 @@
     QCoreApplication::instance()->quit();
 }
 
+void *oad_create_manager(QObject *parent)
+{
+    return new Manager(parent);
+}
+
 #include "manager.moc"

=== renamed file 'src/daemon/manager.h' => 'src/lib/OnlineAccountsDaemon/manager.h'
--- src/daemon/manager.h	2015-07-10 11:33:58 +0000
+++ src/lib/OnlineAccountsDaemon/manager.h	2015-09-23 12:41:07 +0000
@@ -26,10 +26,16 @@
 #include <QList>
 #include <QObject>
 #include <QVariantMap>
-#include "account_info.h"
+
+#include "global.h"
+
+extern "C" {
+OAD_EXPORT void *oad_create_manager(QObject *parent);
+}
 
 namespace OnlineAccountsDaemon {
 
+struct AccountInfo;
 class CallContext;
 class ManagerAdaptor;
 

=== renamed file 'src/daemon/manager_adaptor.cpp' => 'src/lib/OnlineAccountsDaemon/manager_adaptor.cpp'
=== renamed file 'src/daemon/manager_adaptor.h' => 'src/lib/OnlineAccountsDaemon/manager_adaptor.h'
--- src/daemon/manager_adaptor.h	2015-08-03 08:55:36 +0000
+++ src/lib/OnlineAccountsDaemon/manager_adaptor.h	2015-09-23 12:41:07 +0000
@@ -28,6 +28,7 @@
 #include <QString>
 #include <QVariantMap>
 #include <sys/types.h>
+#include "account_info.h"
 #include "manager.h"
 
 namespace OnlineAccountsDaemon {

=== renamed file 'src/daemon/state_saver.cpp' => 'src/lib/OnlineAccountsDaemon/state_saver.cpp'
=== renamed file 'src/daemon/state_saver.h' => 'src/lib/OnlineAccountsDaemon/state_saver.h'
=== modified file 'src/lib/Ubuntu/OnlineAccounts.2/account.cpp'
--- src/lib/Ubuntu/OnlineAccounts.2/account.cpp	2015-07-31 12:44:30 +0000
+++ src/lib/Ubuntu/OnlineAccounts.2/account.cpp	2015-09-23 12:41:07 +0000
@@ -70,12 +70,58 @@
         map["errorCode"] = reply.error().code();
         map["errorText"] = reply.error().text();
     } else {
-        map = replyToMap(*watcher, m_account->authenticationMethod());
+        map = replyToMap(*watcher);
     }
 
     Q_EMIT q->authenticationReply(map);
 }
 
+/*!
+ * \qmltype Account
+ * \inqmlmodule Ubuntu.OnlineAccounts 2.0
+ * \ingroup Ubuntu
+ * \brief Representation of an online account
+ *
+ * The Account object holds the information related to an account and provides
+ * methods to interact with it.
+ * It's not possible to create such objects from QML; instead, they are
+ * returned by the \l AccountModel in the \c account role or in the \l
+ * {AccountModel::accountList} { \c accountList} property.
+ *
+ * Here's an example on how to use the account object in a delegate:
+ *
+ * \qml
+ *     import QtQuick 2.0
+ *     import Ubuntu.OnlineAccounts 2.0
+ *
+ *     ListView {
+ *         model: AccountModel {}
+ *         delegate: Button {
+ *             text: "Authenticate " + model.displayName
+ *             onClicked: model.account.authenticate({})
+ *             Connections {
+ *                 target: model.account
+ *                 onAuthenticationReply: {
+ *                     console.log("Access token is " + reply['AccessToken'])
+ *                 }
+ *             }
+ *         }
+ *     }
+ * \endqml
+ *
+ * \target errorCode
+ * \section3 Error codes used in this module
+ * Some operations, such as the \l Account::authenticate() and the \l
+ * AccountModel::requestAccess() methods, can fail and return one of these
+ * error codes:
+ * \list
+ * \li \c Account.ErrorCodeNoAccount - The accounts is invalid
+ * \li \c Account.ErrorCodeUserCanceled - The operation was canceled by the user
+ * \li \c Account.ErrorCodePermissionDenied - The application has no
+ *     permission to complete the operation
+ * \endlist
+ */
+
 Account::Account(OnlineAccounts::Account *account, QObject *parent):
     QObject(parent),
     d_ptr(new AccountPrivate(account, this))
@@ -87,41 +133,89 @@
     delete d_ptr;
 }
 
+/*!
+ * \qmlproperty bool Account::valid
+ *
+ * Whether the account object is valid; this is usually \c true, because the \c
+ * AccountModel never gives out invalid accounts. However, it can happen that a
+ * valid account becomes invalid while the application is using it (if, for
+ * instance, the user deleted the account or revoked the application's access
+ * rights to use it). As soon as this property becomes \c false, the
+ * application should stop using this account.
+ */
 bool Account::isValid() const
 {
     Q_D(const Account);
     return d->m_account->isValid();
 }
 
+/*!
+ * \qmlproperty string Account::displayName
+ *
+ * The display name of the account. This is usually the user's login name, but
+ * applications should not rely on the value of this property. Use it only for
+ * display purposes.
+ */
 QString Account::displayName() const
 {
     Q_D(const Account);
     return d->m_account->displayName();
 }
 
+/*!
+ * \qmlproperty int Account::accountId
+ *
+ * Numeric identifier of the account. This property remains constant during the
+ * lifetime of the account. Note, however, that if the user deletes the account
+ * and re-creates it, its ID will be different.
+ */
 int Account::accountId() const
 {
     Q_D(const Account);
     return d->m_account->id();
 }
 
+/*!
+ * \qmlproperty int Account::serviceId
+ *
+ * Identifier for the service used with the account.
+ */
 QString Account::serviceId() const
 {
     Q_D(const Account);
     return d->m_account->serviceId();
 }
 
+/*!
+ * \qmlproperty enumeration Account::authenticationMethod
+ *
+ * The authentication method used when authenticating with the account.
+ * Currently, these authentication methods are supported:
+ * \list
+ *   \li \c Account.AuthenticationMethodOAuth1 - OAuth 1.0
+ *   \li \c Account.AuthenticationMethodOAuth2 - OAuth 2.0
+ *   \li \c Account.AuthenticationMethodPassword - username/password
+ * \endlist
+ */
 Account::AuthenticationMethod Account::authenticationMethod() const
 {
     Q_D(const Account);
     return AuthenticationMethod(d->m_account->authenticationMethod());
 }
 
+/*!
+ * \qmlproperty jsobject Account::settings
+ *
+ * A dictionary of the settings stored into the account.
+ */
 QVariantMap Account::settings() const
 {
-    /* FIXME: libOnlineAccountsQt lacks a way to retrieve the list of settings;
-     * until that is available, we cannot do much here */
-    return QVariantMap();
+    Q_D(const Account);
+    QVariantMap ret;
+    Q_FOREACH(const QString &key, d->m_account->keys()) {
+        ret.insert(key, d->m_account->setting(key));
+    }
+    return ret;
 }
 
 OnlineAccounts::Account *Account::internalObject() const
@@ -130,6 +224,45 @@
     return d->m_account;
 }
 
+/*!
+ * \qmlsignal Account::authenticationReply(jsobject authenticationData)
+ *
+ * Emitted when the authentication completes. The \a authenticationData object
+ * will contain the authentication reply. If the authentication failed, the
+ * following two keys will be present:
+ * \list
+ * \li \c errorCode is an \l {errorCode} {error code}
+ * \li \c errorText is a textual description of the error, not meant for the
+ *     end-user; it can be used for debugging purposes
+ * \endlist
+ */
+
+/*!
+ * \qmlmethod void Account::authenticate(jsobject params)
+ *
+ * Perform the authentication on this account. The \a params parameter can be
+ * used to pass authentication data, such as the ClientId and ClientSecret used
+ * in the OAuth flow. The list of the supported authentication parameters
+ * depend on the authentication method being used, and are documented in the
+ * Online Accounts development Guide in the Ubuntu Developer Portal.
+ *
+ * There are, however, two authentication parameters which are available
+ * regardless of the authentication method being used:
+ * \list
+ * \li \c invalidateCachedReply can be set to \c true when the previous
+ *     authentication reply returned an invalid access token. It will ensure
+ *     the creation of a new access token.
+ * \li \c interactive is \c true by default; if set to \c false, it will ensure
+ *     that no interaction with the user will occur.
+ * \endlist
+ *
+ * Each call to this method will cause the \l authenticationReply signal to be
+ * emitted at some time later. Note that the authentication might involve
+ * interactions with the network or with the end-user, so don't expect a reply
+ * to be emitted immediately.
+ *
+ * \sa authenticationReply
+ */
 void Account::authenticate(const QVariantMap &params)
 {
     Q_D(Account);

=== modified file 'src/lib/Ubuntu/OnlineAccounts.2/account.h'
--- src/lib/Ubuntu/OnlineAccounts.2/account.h	2015-07-31 12:44:30 +0000
+++ src/lib/Ubuntu/OnlineAccounts.2/account.h	2015-09-23 12:41:07 +0000
@@ -35,7 +35,7 @@
 class Account: public QObject
 {
     Q_OBJECT
-    Q_ENUMS(AuthenticationMethod)
+    Q_ENUMS(AuthenticationMethod ErrorCode)
     Q_PROPERTY(bool valid READ isValid NOTIFY validChanged)
     Q_PROPERTY(QString displayName READ displayName NOTIFY accountChanged)
     Q_PROPERTY(int accountId READ accountId CONSTANT)
@@ -53,6 +53,16 @@
         AuthenticationMethodPassword,
     };
 
+    enum ErrorCode {
+        // Make sure these are kept in sync with those from OnlineAccountsQt
+        ErrorCodeNoError = 0,
+        ErrorCodeNoAccount,
+        ErrorCodeWrongType,
+        ErrorCodeUserCanceled,
+        ErrorCodePermissionDenied,
+        ErrorCodeInteractionRequired,
+    };
+
     explicit Account(OnlineAccounts::Account *account, QObject *parent = 0);
     ~Account();
 

=== modified file 'src/lib/Ubuntu/OnlineAccounts.2/account_model.cpp'
--- src/lib/Ubuntu/OnlineAccounts.2/account_model.cpp	2015-08-06 12:22:06 +0000
+++ src/lib/Ubuntu/OnlineAccounts.2/account_model.cpp	2015-09-23 12:41:07 +0000
@@ -130,6 +130,13 @@
 {
     m_updateQueued = false;
 
+    if (m_applicationId.isEmpty()) {
+        QStringList parts = QString::fromUtf8(qgetenv("APP_ID")).split('_');
+        if (parts.count() == 3) {
+            m_applicationId = QStringList(parts.mid(0, 2)).join('_');
+        }
+    }
+
     if (m_applicationIdChanged) {
         delete m_manager;
         m_manager = new OnlineAccounts::Manager(m_applicationId);
@@ -179,8 +186,7 @@
         OnlineAccounts::Account *account = reply.account();
         accountData["account"] =
             QVariant::fromValue<QObject*>(handleAccount(account));
-        auto method = account->authenticationMethod();
-        authenticationData = replyToMap(*watcher, method);
+        authenticationData = replyToMap(*watcher);
     }
 
     Q_EMIT q->accessReply(accountData, authenticationData);
@@ -221,6 +227,42 @@
     q->dataChanged(idx, idx);
 }
 
+/*!
+ * \qmltype AccountModel
+ * \inqmlmodule Ubuntu.OnlineAccounts 2.0
+ * \ingroup Ubuntu
+ * \brief Model of available online accounts.
+ *
+ * The AccountModel lists all the accounts available to the application.
+ * \qml
+ *     import QtQuick 2.0
+ *     import Ubuntu.OnlineAccounts 2.0
+ *
+ *     ListView {
+ *         model: AccountModel {
+ *             applicationId: "myapp.developer_myapp"
+ *         }
+ *         delegate: Text {
+ *             text: model.displayName
+ *         }
+ *     }
+ * \endqml
+ *
+ * The model defines the following roles:
+ *
+ * \list
+ * \li \c displayName is the name of the account (usually the user's login)
+ * \li \c accountId is a numeric ID for the account
+ * \li \c serviceId is a service identifier (e.g., "myapp.developer_myapp_google")
+ * \li \c authenticationMethod is the authentication method used on this
+ *     account; \sa Account::authenticationMethod
+ * \li \c settings is a dictionary of the settings stored into the account
+ * \li \c account is the \l Account object
+ * \endlist
+ *
+ * \sa Account
+ */
+
 AccountModel::AccountModel(QObject *parent):
     QAbstractListModel(parent),
     d_ptr(new AccountModelPrivate(this))
@@ -248,6 +290,13 @@
     d->update();
 }
 
+/*!
+ * \qmlproperty string AccountModel::applicationId
+ *
+ * The short application identifier (that is, the \c APP_ID minus the version
+ * component) of the client. If not given, the identifier will be deduced from
+ * the APP_ID environment variable.
+ */
 void AccountModel::setApplicationId(const QString &applicationId)
 {
     Q_D(AccountModel);
@@ -265,6 +314,12 @@
     return d->m_applicationId;
 }
 
+/*!
+ * \qmlproperty string AccountModel::serviceId
+ *
+ * If this property is set, only accounts providing the given service will be
+ * returned.
+ */
 void AccountModel::setServiceId(const QString &serviceId)
 {
     Q_D(AccountModel);
@@ -282,6 +337,13 @@
     return d->m_serviceId;
 }
 
+/*!
+ * \qmlproperty list<Account> AccountModel::accountList
+ *
+ * List of accounts in the model. This list has exactly the same contents as
+ * the model data, and is provided as a property just as a convenience for
+ * those cases when a model is not required.
+ */
 QList<QObject*> AccountModel::accountList() const
 {
     Q_D(const AccountModel);
@@ -292,6 +354,47 @@
     return objects;
 }
 
+/*!
+ * \qmlsignal AccountModel::accessReply(jsobject reply, jsobject authenticationData)
+ *
+ * Emitted when the request initiated with \l AccountModel::requestAccess()
+ * completes. The \a reply object contains the access reply:
+ * \list
+ * \li \c account if access to an account was granted, this property will hold
+ *     an \l Account object
+ * \li \c errorCode \l {errorCode} {error code}, if an error occurred
+ * \li \c errorText is a textual description of the error, not meant for the
+ *     end-user; it can be used for debugging purposes
+ * \endlist
+ *
+ * The second parameter, the \a authenticationData object, will contain the
+ * authentication reply.
+ */
+
+/*!
+ * \qmlmethod void AccountModel::requestAccess(string serviceId,
+ *                                             jsobject parameters)
+ *
+ * Requests the user to grant this application access to an account providing
+ * the given service. The user will be asked whether this application should be
+ * given access to the desired account; if no such accounts are currently
+ * registered in the system, the user will be guided to create a new one.
+ *
+ * It should be noted that account authorizations persist across application
+ * restart; therefore, this method should be called only when the application
+ * needs a new account to appear in the model.
+ *
+ * Each call to this method will cause the \l accessReply signal to be
+ * emitted at some time later. Note that the operation will involve
+ * interactions with the end-user, so don't expect a reply to be emitted
+ * immediately.
+ *
+ * The \a parameters parameter can be used to pass authentication data
+ * (similarly to how the \l Account::authenticate() method works), if it's
+ * desired to perform the authentication at the same time.
+ *
+ * \sa accessReply
+ */
 void AccountModel::requestAccess(const QString &service,
                                  const QVariantMap &parameters)
 {
@@ -305,6 +408,17 @@
                      d, SLOT(onAccessRequestFinished()));
 }
 
+/*!
+ * \qmlmethod variant AccountModel::get(int row, string roleName)
+ *
+ * Returns the data at \a row for the role \a roleName.
+ */
+QVariant AccountModel::get(int row, const QString &roleName) const
+{
+    int role = roleNames().key(roleName.toLatin1(), -1);
+    return data(index(row), role);
+}
+
 int AccountModel::rowCount(const QModelIndex &parent) const
 {
     Q_D(const AccountModel);

=== modified file 'src/lib/Ubuntu/OnlineAccounts.2/account_model.h'
--- src/lib/Ubuntu/OnlineAccounts.2/account_model.h	2015-08-06 12:22:06 +0000
+++ src/lib/Ubuntu/OnlineAccounts.2/account_model.h	2015-09-23 12:41:07 +0000
@@ -68,6 +68,8 @@
     Q_INVOKABLE void requestAccess(const QString &service,
                                    const QVariantMap &params);
 
+    Q_INVOKABLE QVariant get(int row, const QString &roleName) const;
+
     // reimplemented virtual methods
     int rowCount(const QModelIndex &parent = QModelIndex()) const;
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;

=== modified file 'src/lib/Ubuntu/OnlineAccounts.2/authentication_data.cpp'
--- src/lib/Ubuntu/OnlineAccounts.2/authentication_data.cpp	2015-08-06 12:22:06 +0000
+++ src/lib/Ubuntu/OnlineAccounts.2/authentication_data.cpp	2015-09-23 12:41:07 +0000
@@ -23,92 +23,24 @@
 #include "OnlineAccounts/PendingCall"
 #include <QDebug>
 
-static void commonParamsFromMap(OnlineAccounts::AuthenticationData &data,
-                                const QVariantMap &params)
-{
+QVariantMap replyToMap(const OnlineAccounts::PendingCall &call)
+{
+    OnlineAccounts::AuthenticationReply reply(call);
+    return reply.data();
+}
+
+OnlineAccounts::AuthenticationData
+authenticationDataFromMap(const QVariantMap &params,
+                          OnlineAccounts::AuthenticationMethod method)
+{
+    OnlineAccounts::AuthenticationData data(method);
+    QVariantMap cleanedParams(params);
     data.setInteractive(params.value("interactive", true).toBool());
     if (params["invalidateCachedReply"].toBool()) {
         data.invalidateCachedReply();
     }
-}
-
-QVariantMap replyToMap(const OnlineAccounts::PendingCall &call,
-                       OnlineAccounts::AuthenticationMethod method)
-{
-    QVariantMap map;
-    switch (method) {
-    case OnlineAccounts::AuthenticationMethodOAuth1:
-        {
-            OnlineAccounts::OAuth1Reply reply(call);
-            map["ConsumerKey"] = QString::fromUtf8(reply.consumerKey());
-            map["ConsumerSecret"] = QString::fromUtf8(reply.consumerSecret());
-            map["Token"] = QString::fromUtf8(reply.token());
-            map["TokenSecret"] = QString::fromUtf8(reply.tokenSecret());
-            map["SignatureMethod"] = QString::fromUtf8(reply.signatureMethod());
-            return map;
-        }
-    case OnlineAccounts::AuthenticationMethodOAuth2:
-        {
-            OnlineAccounts::OAuth2Reply reply(call);
-            map["AccessToken"] = QString::fromUtf8(reply.accessToken());
-            map["ExpiresIn"] = reply.expiresIn();
-            QStringList grantedScopes;
-            Q_FOREACH(const QByteArray &s, reply.grantedScopes()) {
-                grantedScopes.append(s);
-            }
-            map["GrantedScopes"] = grantedScopes;
-            return map;
-        }
-    case OnlineAccounts::AuthenticationMethodPassword:
-        {
-            OnlineAccounts::PasswordReply reply(call);
-            map["Username"] = reply.username();
-            map["Password"] = reply.password();
-            return map;
-        }
-    default:
-        return map;
-    }
-}
-
-OnlineAccounts::AuthenticationData
-authenticationDataFromMap(const QVariantMap &params,
-                          OnlineAccounts::AuthenticationMethod method)
-{
-    switch (method) {
-    case OnlineAccounts::AuthenticationMethodOAuth1:
-        {
-            OnlineAccounts::OAuth1Data data;
-            if (params.contains("ConsumerKey")) {
-                data.setConsumerKey(params["ConsumerKey"].toByteArray());
-                data.setConsumerSecret(params["ConsumerSecret"].toByteArray());
-            }
-            commonParamsFromMap(data, params);
-            return data;
-        }
-    case OnlineAccounts::AuthenticationMethodOAuth2:
-        {
-            OnlineAccounts::OAuth2Data data;
-            if (params.contains("ClientId")) {
-                data.setClientId(params["ClientId"].toByteArray());
-                data.setClientSecret(params["ClientSecret"].toByteArray());
-            }
-            if (params.contains("Scopes")) {
-                QList<QByteArray> scopes;
-                Q_FOREACH(const QString &s, params["Scopes"].toStringList()) {
-                    scopes.append(s.toUtf8());
-                }
-                data.setScopes(scopes);
-            }
-            commonParamsFromMap(data, params);
-            return data;
-        }
-    case OnlineAccounts::AuthenticationMethodPassword:
-    default:
-        {
-            OnlineAccounts::PasswordData data;
-            commonParamsFromMap(data, params);
-            return data;
-        }
-    }
+    cleanedParams.remove("interactive");
+    cleanedParams.remove("invalidateCachedReply");
+    data.setParameters(cleanedParams);
+    return data;
 }

=== modified file 'src/lib/Ubuntu/OnlineAccounts.2/authentication_data.h'
--- src/lib/Ubuntu/OnlineAccounts.2/authentication_data.h	2015-07-31 12:44:30 +0000
+++ src/lib/Ubuntu/OnlineAccounts.2/authentication_data.h	2015-09-23 12:41:07 +0000
@@ -28,8 +28,7 @@
 #include "OnlineAccounts/AuthenticationData"
 #include <QVariantMap>
 
-QVariantMap replyToMap(const OnlineAccounts::PendingCall &call,
-                       OnlineAccounts::AuthenticationMethod method);
+QVariantMap replyToMap(const OnlineAccounts::PendingCall &call);
 
 OnlineAccounts::AuthenticationData
 authenticationDataFromMap(const QVariantMap &params,

=== modified file 'tests/daemon/functional_tests/daemon_interface.h'
--- tests/daemon/functional_tests/daemon_interface.h	2015-07-01 13:49:00 +0000
+++ tests/daemon/functional_tests/daemon_interface.h	2015-09-23 12:41:07 +0000
@@ -21,7 +21,7 @@
 #ifndef OAD_DAEMON_INTERFACE_H
 #define OAD_DAEMON_INTERFACE_H
 
-#include "daemon/dbus_constants.h"
+#include "OnlineAccountsDaemon/dbus_constants.h"
 
 #include <QDBusAbstractInterface>
 #include <QDBusArgument>

=== modified file 'tests/daemon/functional_tests/data/com.ubuntu.OnlineAccounts.Manager.service.in'
--- tests/daemon/functional_tests/data/com.ubuntu.OnlineAccounts.Manager.service.in	2015-07-01 13:49:00 +0000
+++ tests/daemon/functional_tests/data/com.ubuntu.OnlineAccounts.Manager.service.in	2015-09-23 12:41:07 +0000
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=com.ubuntu.OnlineAccounts.Manager
-Exec=${OnlineAccountsDaemon_BINARY_DIR}/accountd
+Exec=${accountd_BINARY_DIR}/accountd

=== modified file 'tests/daemon/functional_tests/functional_tests.cpp'
--- tests/daemon/functional_tests/functional_tests.cpp	2015-08-04 14:10:14 +0000
+++ tests/daemon/functional_tests/functional_tests.cpp	2015-09-23 12:41:07 +0000
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "daemon/dbus_constants.h"
+#include "OnlineAccountsDaemon/dbus_constants.h"
 #include "daemon_interface.h"
 #include "fake_dbus_apparmor.h"
 #include "fake_online_accounts_service.h"
@@ -221,6 +221,8 @@
     QVERIFY(account3 != 0);
     account3->setEnabled(true);
     account3->setDisplayName("CoolAccount 3");
+    account3->setValue("color", "red");
+    account3->setValue("size", "big");
     account3->setCredentialsId(m_account3CredentialsId);
     account3->selectService(coolMail);
     account3->setEnabled(true);
@@ -410,6 +412,7 @@
     accountInfo["settings/auth/oauth2/user_agent/host"] = "coolmail.ex";
     accountInfo["settings/auto-explode-after"] = 10;
     accountInfo["settings/color"] = "green";
+    accountInfo["settings/size"] = "big";
     credentials["host"] = "coolmail.ex";
     QTest::newRow("no auth params") <<
         "coolmail" <<

=== modified file 'tests/lib/OnlineAccounts/functional_tests/functional_tests.cpp'
--- tests/lib/OnlineAccounts/functional_tests/functional_tests.cpp	2015-05-26 14:23:10 +0000
+++ tests/lib/OnlineAccounts/functional_tests/functional_tests.cpp	2015-09-23 12:41:07 +0000
@@ -24,13 +24,22 @@
 #include "OnlineAccounts/OAuth2Data"
 #include "OnlineAccounts/PasswordData"
 #include "OnlineAccounts/account_info.h"
-#include "daemon/dbus_constants.h"
+#include "OnlineAccountsDaemon/dbus_constants.h"
 #include <QDBusConnection>
 #include <QObject>
 #include <QSignalSpy>
 #include <QTest>
 #include <libqtdbusmock/DBusMock.h>
 
+namespace QTest {
+template<>
+char *toString(const QVariantMap &map)
+{
+    QJsonDocument doc(QJsonObject::fromVariantMap(map));
+    return qstrdup(doc.toJson(QJsonDocument::Compact).data());
+}
+} // QTest namespace
+
 class FunctionalTests: public QObject
 {
     Q_OBJECT
@@ -316,9 +325,11 @@
     QCOMPARE(account->serviceId(), serviceId);
     QCOMPARE(int(account->authenticationMethod()), authenticationMethod);
 
-    Q_FOREACH(const QString &key, settings.keys()) {
-        QCOMPARE(account->setting(key), settings.value(key));
+    QVariantMap accountSettings;
+    Q_FOREACH(const QString &key, account->keys()) {
+        accountSettings.insert(key, account->setting(key));
     }
+    QCOMPARE(accountSettings, settings);
 
     delete account;
 }
@@ -481,6 +492,14 @@
     QCOMPARE(oauth1reply.token(), QByteArray("a token"));
     QCOMPARE(oauth1reply.tokenSecret(), QByteArray("a token secret"));
     QCOMPARE(oauth1reply.signatureMethod(), QByteArray("PLAIN"));
+    /* Compare the whole data dictionary */
+    QVariantMap expectedData;
+    expectedData.insert(ONLINE_ACCOUNTS_AUTH_KEY_CONSUMER_KEY, "a key");
+    expectedData.insert(ONLINE_ACCOUNTS_AUTH_KEY_CONSUMER_SECRET, "a secret");
+    expectedData.insert(ONLINE_ACCOUNTS_AUTH_KEY_TOKEN, "a token");
+    expectedData.insert(ONLINE_ACCOUNTS_AUTH_KEY_TOKEN_SECRET, "a token secret");
+    expectedData.insert(ONLINE_ACCOUNTS_AUTH_KEY_SIGNATURE_METHOD, "PLAIN");
+    QCOMPARE(oauth1reply.data(), expectedData);
 
     /* Test OAuth 2.0 */
     account = manager.account(2);

=== modified file 'tests/lib/OnlineAccounts/tst_authentication_data/tst_authentication_data.cpp'
--- tests/lib/OnlineAccounts/tst_authentication_data/tst_authentication_data.cpp	2015-02-27 12:39:02 +0000
+++ tests/lib/OnlineAccounts/tst_authentication_data/tst_authentication_data.cpp	2015-09-23 12:41:07 +0000
@@ -49,6 +49,17 @@
     oauth2.setClientId("client-changed");
     QCOMPARE(oauth2.clientId(), QByteArray("client-changed"));
     QCOMPARE(copy.clientId(), QByteArray("client"));
+
+    /* As dictionary */
+    QVariantMap expectedParameters;
+    expectedParameters.insert("ClientId", "client-changed");
+    QCOMPARE(oauth2.parameters(), expectedParameters);
+
+    QVariantMap parameters;
+    parameters.insert("UnknownKey", "some value");
+    parameters.insert("Hello", "World");
+    oauth2.setParameters(parameters);
+    QCOMPARE(oauth2.parameters(), parameters);
 }
 
 QTEST_MAIN(AuthenticationDataTest)

=== modified file 'tests/lib/qml_module/tst_qml_module.cpp'
--- tests/lib/qml_module/tst_qml_module.cpp	2015-08-06 12:22:06 +0000
+++ tests/lib/qml_module/tst_qml_module.cpp	2015-09-23 12:41:07 +0000
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "daemon/dbus_constants.h"
+#include "OnlineAccountsDaemon/dbus_constants.h"
 #include <QDBusArgument>
 #include <QDBusConnection>
 #include <QJsonDocument>
@@ -157,17 +157,24 @@
     QTest::addColumn<QString>("displayName");
     QTest::addColumn<QString>("serviceId");
     QTest::addColumn<int>("authenticationMethod");
+    QTest::addColumn<QVariantMap>("settings");
 
+    QVariantMap settings;
     QTest::newRow("empty") <<
         "{}" <<
-        "" << "" << 0;
+        "" << "" << 0 << settings;
+
+    settings.insert("Server", "www.example.com");
+    settings.insert("Port", "9900");
     QTest::newRow("complete") <<
         "{"
         " '" ONLINE_ACCOUNTS_INFO_KEY_DISPLAY_NAME "': 'Tom',"
         " '" ONLINE_ACCOUNTS_INFO_KEY_SERVICE_ID "': 'cool',"
         " '" ONLINE_ACCOUNTS_INFO_KEY_AUTH_METHOD "': 2,"
+        " '" ONLINE_ACCOUNTS_INFO_KEY_SETTINGS "Server': 'www.example.com',"
+        " '" ONLINE_ACCOUNTS_INFO_KEY_SETTINGS "Port': 9900,"
         "}" <<
-        "Tom" << "cool" << 2;
+        "Tom" << "cool" << 2 << settings;
 }
 
 void ModuleTest::testModelRoles()
@@ -176,6 +183,7 @@
     QFETCH(QString, displayName);
     QFETCH(QString, serviceId);
     QFETCH(int, authenticationMethod);
+    QFETCH(QVariantMap, settings);
 
     addMockedMethod("GetAccounts", "a{sv}", "a(ua{sv})",
                     QString("ret = [(1, %1)]").arg(accountData));
@@ -200,7 +208,7 @@
     QCOMPARE(get(model, 0, "authenticationMethod").toInt(),
              authenticationMethod);
     // until https://bugs.launchpad.net/bugs/1479768 is fixed
-    QCOMPARE(get(model, 0, "settings").toMap(), QVariantMap());
+    QCOMPARE(get(model, 0, "settings").toMap(), settings);
     QObject *account = get(model, 0, "account").value<QObject*>();
     QVERIFY(account != 0);
     QCOMPARE(account->metaObject()->className(), "OnlineAccountsModule::Account");
@@ -362,6 +370,7 @@
     accessReply.clear();
     accessReply["accountDisplayName"] = "Bob";
     authenticationData.clear();
+    authenticationData.insert("AccessToken", "GoOn");
     QTest::newRow("access granted") <<
         "ret = ((1, {'displayName': 'Bob'}),{'AccessToken':'GoOn'})" <<
         accessReply <<
@@ -551,174 +560,6 @@
 
     delete object;
 }
-/*
-void ModuleTest::testAuthentication()
-{
-    addMockedMethod("GetAccounts", "a{sv}", "a(ua{sv})",
-                    "ret = ["
-                    "(1, {"
-                    "  'displayName': 'Bob',"
-                    "  'serviceId': 'MyService0',"
-                    "  'authMethod': 1,"
-                    "}),"
-                    "(2, {"
-                    "  'displayName': 'Tom',"
-                    "  'serviceId': 'MyService1',"
-                    "  'authMethod': 2,"
-                    "}),"
-                    "(3, {"
-                    "  'displayName': 'Sam',"
-                    "  'serviceId': 'MyService2',"
-                    "  'authMethod': 3,"
-                    "}),"
-                    "]");
-    addMockedMethod("Authenticate", "usbba{sv}", "a{sv}",
-                    "if args[0] == 1:\n"
-                    "  ret = {"
-                    "    'ConsumerKey': args[4]['ConsumerKey'],"
-                    "    'ConsumerSecret': args[4]['ConsumerSecret'],"
-                    "    'Token': 'a token',"
-                    "    'TokenSecret': 'a token secret',"
-                    "    'SignatureMethod': 'PLAIN',"
-                    "  }\n"
-                    "elif args[0] == 2:\n"
-                    "  ret = {"
-                    "    'AccessToken': 'my token',"
-                    "    'ExpiresIn': 3600,"
-                    "    'GrantedScopes': args[4]['Scopes'],"
-                    "  }\n"
-                    "elif args[0] == 3:\n"
-                    "  ret = {"
-                    "    'Username': 'admin',"
-                    "    'Password': 'rootme',"
-                    "  }\n"
-                    "else:\n"
-                    "  ret = {}");
-    OnlineAccounts::Manager manager("my-app");
-    manager.waitForReady();
-
-    OnlineAccounts::Account *account = manager.account(1);
-    QVERIFY(account);
-    QCOMPARE(account->authenticationMethod(),
-             OnlineAccounts::AuthenticationMethodOAuth1);
-    OnlineAccounts::OAuth1Data oauth1data;
-    oauth1data.setInteractive(false);
-    oauth1data.setConsumerKey("a key");
-    QCOMPARE(oauth1data.consumerKey(), QByteArray("a key"));
-    oauth1data.setConsumerSecret("a secret");
-    QCOMPARE(oauth1data.consumerSecret(), QByteArray("a secret"));
-
-    OnlineAccounts::OAuth1Reply oauth1reply(account->authenticate(oauth1data));
-    QCOMPARE(oauth1reply.consumerKey(), QByteArray("a key"));
-    QCOMPARE(oauth1reply.consumerSecret(), QByteArray("a secret"));
-    QCOMPARE(oauth1reply.token(), QByteArray("a token"));
-    QCOMPARE(oauth1reply.tokenSecret(), QByteArray("a token secret"));
-    QCOMPARE(oauth1reply.signatureMethod(), QByteArray("PLAIN"));
-
-    account = manager.account(2);
-    QVERIFY(account);
-    QCOMPARE(account->authenticationMethod(),
-             OnlineAccounts::AuthenticationMethodOAuth2);
-    OnlineAccounts::OAuth2Data oauth2data;
-    oauth2data.invalidateCachedReply();
-    QVERIFY(oauth2data.mustInvalidateCachedReply());
-    oauth2data.setClientId("a client");
-    QCOMPARE(oauth2data.clientId(), QByteArray("a client"));
-    oauth2data.setClientSecret("a secret");
-    QCOMPARE(oauth2data.clientSecret(), QByteArray("a secret"));
-    QList<QByteArray> scopes =
-        QList<QByteArray>() << "one" << "two" << "three";
-    oauth2data.setScopes(scopes);
-    QCOMPARE(oauth2data.scopes(), scopes);
-
-    OnlineAccounts::OAuth2Reply oauth2reply(account->authenticate(oauth2data));
-    QCOMPARE(oauth2reply.accessToken(), QByteArray("my token"));
-    QCOMPARE(oauth2reply.expiresIn(), 3600);
-    QCOMPARE(oauth2reply.grantedScopes(), scopes);
-
-    account = manager.account(3);
-    QVERIFY(account);
-    QCOMPARE(account->authenticationMethod(),
-             OnlineAccounts::AuthenticationMethodPassword);
-    OnlineAccounts::PasswordData pwdata;
-
-    OnlineAccounts::PasswordReply pwreply(account->authenticate(pwdata));
-    QCOMPARE(pwreply.username(), QByteArray("admin"));
-    QCOMPARE(pwreply.password(), QByteArray("rootme"));
-
-    OnlineAccounts::OAuth2Data copy(oauth2data);
-    QCOMPARE(copy.clientId(), QByteArray("a client"));
-    copy.setClientId("new client");
-    QCOMPARE(copy.clientId(), QByteArray("new client"));
-    QCOMPARE(oauth2data.clientId(), QByteArray("a client"));
-}
-
-void ModuleTest::testAuthenticationErrors_data()
-{
-    QTest::addColumn<QString>("reply");
-    QTest::addColumn<int>("errorCode");
-    QTest::addColumn<QString>("errorMessage");
-
-    QTest::newRow("random dbus error") <<
-        "raise dbus.exceptions.DBusException('not foobarized', name='org.foo.bar')" <<
-        int(OnlineAccounts::Error::PermissionDenied) <<
-        "not foobarized";
-
-    QTest::newRow("no account") <<
-        "raise dbus.exceptions.DBusException('Not there',"
-        "name='" ONLINE_ACCOUNTS_ERROR_NO_ACCOUNT "')" <<
-        int(OnlineAccounts::Error::NoAccount) <<
-        "Not there";
-
-    QTest::newRow("user canceled") <<
-        "raise dbus.exceptions.DBusException('Sorry',"
-        "name='" ONLINE_ACCOUNTS_ERROR_USER_CANCELED "')" <<
-        int(OnlineAccounts::Error::UserCanceled) <<
-        "Sorry";
-
-    QTest::newRow("permission denied") <<
-        "raise dbus.exceptions.DBusException('Nope',"
-        "name='" ONLINE_ACCOUNTS_ERROR_PERMISSION_DENIED "')" <<
-        int(OnlineAccounts::Error::PermissionDenied) <<
-        "Nope";
-
-    QTest::newRow("Interaction required") <<
-        "raise dbus.exceptions.DBusException('Ask the user',"
-        "name='" ONLINE_ACCOUNTS_ERROR_INTERACTION_REQUIRED "')" <<
-        int(OnlineAccounts::Error::InteractionRequired) <<
-        "Ask the user";
-}
-
-void ModuleTest::testAuthenticationErrors()
-{
-    QFETCH(QString, reply);
-    QFETCH(int, errorCode);
-    QFETCH(QString, errorMessage);
-
-    addMockedMethod("GetAccounts", "a{sv}", "a(ua{sv})",
-                    "ret = [(1, {"
-                    "  'displayName': 'Bob',"
-                    "  'serviceId': 'MyService0',"
-                    "  'authMethod': 2,"
-                    "})]");
-    addMockedMethod("Authenticate", "usbba{sv}", "a{sv}", reply);
-    OnlineAccounts::Manager manager("my-app");
-    manager.waitForReady();
-
-    OnlineAccounts::Account *account = manager.account(1);
-    QVERIFY(account);
-
-    OnlineAccounts::OAuth2Data oauth2data;
-    oauth2data.setClientId("a client");
-    oauth2data.setClientSecret("a secret");
-    oauth2data.setScopes(QList<QByteArray>() << "one" << "two");
-
-    OnlineAccounts::OAuth2Reply r(account->authenticate(oauth2data));
-    QVERIFY(r.hasError());
-    QCOMPARE(int(r.error().code()), errorCode);
-    QCOMPARE(r.error().text(), errorMessage);
-}
-*/
 
 QTEST_MAIN(ModuleTest)
 #include "tst_qml_module.moc"