Online Accounts setup for Ubuntu Touch

Merge lp:~laney/ubuntu-system-settings-online-accounts/stub-reset into lp:ubuntu-system-settings-online-accounts

  1. stub-reset
  2. Merge into trunk
Proposed by Iain Lane
Status: Needs review
Proposed branch: lp:~laney/ubuntu-system-settings-online-accounts/stub-reset
Merge into: lp:ubuntu-system-settings-online-accounts
Diff against target: 54 lines (+12/-4)
3 files modified
debian/control (+1/-1)
system-settings-plugin/plugin.cpp (+7/-0)
system-settings-plugin/plugin.h (+4/-3)
To merge this branch: bzr merge lp:~laney/ubuntu-system-settings-online-accounts/stub-reset
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Online Accounts Pending
Review via email: mp+208664@code.launchpad.net

Commit message

Use system-settings' new 'reset' API to implmement a stub reset function

Description of the change

You need https://code.launchpad.net/~laney/ubuntu-system-settings/reset-api/+merge/208661 to test this.

Also the version in debian/control will need to be adjusted when that actually gets uploaded to distro.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:100
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-ci/87/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-trusty-amd64-ci/35/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-trusty-armhf-ci/35/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-trusty-i386-ci/35/console

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

review: Needs Fixing (continuous-integration)
Reply

Unmerged revisions

100. By Iain Lane

Don't forget to declare it in the header

99. By Iain Lane

Use system-settings' new 'reset' API to implmement a stub reset function

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2014-01-31 15:16:57 +0000
3+++ debian/control 2014-02-27 18:21:59 +0000
4@@ -5,7 +5,7 @@
5 Build-Depends: debhelper (>= 9),
6 pkg-config,
7 python:any (>= 2.7),
8- libsystemsettings-dev (>= 0.1+13.10.20130806),
9+ libsystemsettings-dev (>= 0.1+14.04.20140227.1),
10 qt5-default,
11 qtbase5-dev,
12 qtdeclarative5-dev,
13
14=== modified file 'system-settings-plugin/plugin.cpp'
15--- system-settings-plugin/plugin.cpp 2013-09-09 10:56:53 +0000
16+++ system-settings-plugin/plugin.cpp 2014-02-27 18:21:59 +0000
17@@ -70,4 +70,11 @@
18 return new Item(staticData, parent);
19 }
20
21+bool Plugin::reset()
22+{
23+ // Here we noop so that the reset function doesn't call pageComponent()
24+ // which would open the online accounts UI
25+ return true;
26+}
27+
28 #include "plugin.moc"
29
30=== modified file 'system-settings-plugin/plugin.h'
31--- system-settings-plugin/plugin.h 2013-09-09 10:56:53 +0000
32+++ system-settings-plugin/plugin.h 2014-02-27 18:21:59 +0000
33@@ -22,17 +22,18 @@
34 #include <QObject>
35 #include <SystemSettings/PluginInterface>
36
37-class Plugin: public QObject, public SystemSettings::PluginInterface
38+class Plugin: public QObject, public SystemSettings::PluginInterface2
39 {
40 Q_OBJECT
41- Q_PLUGIN_METADATA(IID "com.ubuntu.SystemSettings.PluginInterface")
42- Q_INTERFACES(SystemSettings::PluginInterface)
43+ Q_PLUGIN_METADATA(IID "com.ubuntu.SystemSettings.PluginInterface/2.0")
44+ Q_INTERFACES(SystemSettings::PluginInterface2)
45
46 public:
47 Plugin();
48
49 SystemSettings::ItemBase *createItem(const QVariantMap &staticData,
50 QObject *parent = 0);
51+ bool reset();
52 };
53
54 #endif // ONLINE_ACCOUNTS_SYSTEM_SETTINGS_PLUGIN_H

Subscribers

People subscribed via source and target branches